Merge pull request #56 from syseleven/K8s-9627-update-machinecontroll…

…er-1.58.3 K8s-9627: Update machine-controller from upstream tag 1.58.3
syseleven · Mar 7, 2024 · aaa9abd · aaa9abd
2 parents 3320a58 + 60bca0e
commit aaa9abd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/examples/operating-system-manager.yaml b/examples/operating-system-manager.yaml
@@ -1096,7 +1096,7 @@ spec:
     spec:
       serviceAccountName: operating-system-manager-webhook
       containers:
-        - image: quay.io/kubermatic/operating-system-manager:v1.4.0
+        - image: quay.io/kubermatic/operating-system-manager:v1.4.1
           imagePullPolicy: Always
           name: webhook
           command:
@@ -1424,7 +1424,7 @@ spec:
     spec:
       serviceAccountName: operating-system-manager
       containers:
-        - image: quay.io/kubermatic/operating-system-manager:latest
+        - image: quay.io/kubermatic/operating-system-manager:v1.4.1
           imagePullPolicy: Always
           name: operating-system-manager
           command:

diff --git a/hack/ci/setup-machine-controller-in-kind.sh b/hack/ci/setup-machine-controller-in-kind.sh
@@ -24,7 +24,7 @@ fi
 export MC_VERSION="${MC_VERSION:-$(git rev-parse HEAD)}"
 export OPERATING_SYSTEM_MANAGER="${OPERATING_SYSTEM_MANAGER:-true}"
 OSM_REPO_URL="${OSM_REPO_URL:-https://github.com/kubermatic/operating-system-manager.git}"
-OSM_REPO_TAG="${OSM_REPO_TAG:-main}"
+OSM_REPO_TAG="${OSM_REPO_TAG:-release/v1.4}"
 
 # cert-manager is required by OSM for generating TLS Certificates
 echodate "Installing cert-manager"

diff --git a/pkg/userdata/flatcar/testdata/ignition_v1.28.0.json b/pkg/userdata/flatcar/testdata/ignition_v1.28.0.json
@@ -228,4 +228,4 @@
       }
     ]
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -228,4 +228,4 @@ @@
           }
         ]
       }
-    }
+    }