Upgrade to latest MC image (#3213)

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
kubermatic · Jun 11, 2024 · 03e5fce · 03e5fce
1 parent b9768c8
commit 03e5fce
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 4,123 deletions.
diff --git a/.prow/generated.yaml b/.prow/generated.yaml
diff --git a/addons/machinecontroller/deployment-controller.yaml b/addons/machinecontroller/deployment-controller.yaml
@@ -45,35 +45,14 @@ spec:
           args:
             - -health-probe-address=0.0.0.0:8085
             - -metrics-address=0.0.0.0:8080
-            {{ if .Config.Features.NodeLocalDNS.Deploy -}}
-            - -cluster-dns={{ .Resources.NodeLocalDNSVirtualIP }}
-            {{ end -}}
             - -node-csr-approver
             {{ if .Config.CloudProvider.External -}}
             - -node-external-cloud-provider
-            {{ end }}
-            - -join-cluster-timeout=15m
-            - -node-container-runtime={{ .Config.ContainerRuntime }}
-            {{ range .Config.ContainerRuntime.MachineControllerFlags -}}
-            - {{ . }}
-            {{ end -}}
-            {{ with .Config.Proxy.HTTP -}}
-            - -node-http-proxy={{ . }}
-            {{ end -}}
-            {{ with .Config.Proxy.NoProxy -}}
-            - -node-no-proxy={{ . }}
-            {{ end -}}
-            {{ with .Config.RegistryConfiguration.InsecureRegistryAddress -}}
-            - -node-insecure-registries={{ . }}
             {{ end -}}
             {{ if .Config.CABundle -}}
             - -ca-bundle={{ .Resources.CABundleSSLCertFilePath }}
             {{ end -}}
-            {{ if .OperatingSystemManagerEnabled -}}
-            - -use-osm
-            {{ end -}}
-            - -node-kubelet-repository={{ .Resources.KubeletImageRepository }}
-            - -node-pause-image={{ .InternalImages.Get "PauseImage" }}
+            - -join-cluster-timeout=15m
           env:
             - name: HTTPS_PROXY
               value: "{{ .Config.Proxy.HTTPS }}"

diff --git a/addons/machinecontroller/webhook.yaml b/addons/machinecontroller/webhook.yaml
@@ -85,20 +85,17 @@ spec:
           args:
             - -listen-address=0.0.0.0:9876
             - -namespace=kube-system
-            - -tls-cert-path=/tmp/cert/cert.pem
-            - -tls-key-path=/tmp/cert/key.pem
-            {{ if .Config.CloudProvider.External }}
+            {{ if .Config.CloudProvider.External -}}
             - -node-external-cloud-provider
-            {{ end }}
-            {{ if .CSIMigrationFeatureGates }}
+            {{ end -}}
+            {{ if .CSIMigrationFeatureGates -}}
             - -node-kubelet-feature-gates={{ .CSIMigrationFeatureGates }}
-            {{ end }}
+            {{ end -}}
             {{ if .Config.CABundle -}}
             - -ca-bundle={{ .Resources.CABundleSSLCertFilePath }}
             {{ end -}}
-            {{ if .OperatingSystemManagerEnabled }}
-            - -use-osm
-            {{ end }}
+            - -tls-cert-path=/tmp/cert/cert.pem
+            - -tls-key-path=/tmp/cert/key.pem
           env:
             - name: HTTPS_PROXY
               value: "{{ .Config.Proxy.HTTPS }}"

diff --git a/go.mod b/go.mod
@@ -112,7 +112,6 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/klauspost/compress v1.16.5 // indirect
-	github.com/kubermatic-labs/boilerplate v0.3.0 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/lib/pq v1.10.9 // indirect

diff --git a/go.sum b/go.sum
@@ -276,8 +276,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubermatic-labs/boilerplate v0.3.0 h1:fxQX7wUGi//PsUhm7BHd2IVFTexDw9q7g0WxgFENQu0=
-github.com/kubermatic-labs/boilerplate v0.3.0/go.mod h1:ZVHejB7QRpf39tegpJDHyduszC5LQGRC9GAi70m4aSk=
 github.com/kubermatic/machine-controller v1.57.3 h1:i17ieepdav0q7zAoYRsxOwdZD4dQe4zDI5saqTR2CbI=
 github.com/kubermatic/machine-controller v1.57.3/go.mod h1:vjuE/IcTxlRu4etiDyPasc4O7IcnKMgGl0zbcCjXgvs=
 github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw=

diff --git a/pkg/templates/images/images.go b/pkg/templates/images/images.go
@@ -212,7 +212,7 @@ func baseResources() map[Resource]map[string]string {
 		CalicoNode:             {"*": "quay.io/calico/node:v3.27.3"},
 		DNSNodeCache:           {"*": "registry.k8s.io/dns/k8s-dns-node-cache:1.22.28"},
 		Flannel:                {"*": "docker.io/flannel/flannel:v0.21.3"},
-		MachineController:      {"*": "quay.io/kubermatic/machine-controller:v1.59.1"},
+		MachineController:      {"*": "quay.io/kubermatic/machine-controller:d62ab03c71afd83c2d13549b06f85bd4621ef186"},
 		MetricsServer:          {"*": "registry.k8s.io/metrics-server/metrics-server:v0.7.1"},
 		OperatingSystemManager: {"*": "quay.io/kubermatic/operating-system-manager:v1.5.2"},
 	}

diff --git a/test/e2e/tests_definitions.go b/test/e2e/tests_definitions.go
@@ -1410,14 +1410,6 @@ var (
 			Name:                 "kube_proxy_ipvs_external",
 			ManifestTemplatePath: "testdata/kube_proxy_ipvs_external.yaml",
 		},
-		"legacy_machine_controller_containerd_external": &scenarioInstall{
-			Name:                 "legacy_machine_controller_containerd_external",
-			ManifestTemplatePath: "testdata/legacy_machine_controller_containerd_external.yaml",
-		},
-		"legacy_machine_controller_docker_external": &scenarioInstall{
-			Name:                 "legacy_machine_controller_docker_external",
-			ManifestTemplatePath: "testdata/legacy_machine_controller_docker_external.yaml",
-		},
 		"csi_ccm_migration": &scenarioMigrateCSIAndCCM{
 			Name:                    "csi_ccm_migration",
 			OldManifestTemplatePath: "testdata/containerd_simple.yaml",