Remove obsolete MCM override.

metal-stack · Oct 14, 2024 · 4778947 · 4778947
1 parent a5fc29b
commit 4778947
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/control-plane/roles/gardener/tasks/main.yaml b/control-plane/roles/gardener/tasks/main.yaml
@@ -16,7 +16,6 @@
       - gardener_controller_manager_image_tag is defined
       - gardener_scheduler_image_tag is defined
       - gardener_extension_provider_metal_image_tag is defined
-      - gardener_machine_controller_manager_image_tag is defined
       - gardener_os_controller_image_tag is defined
       - metal_cloud_controller_manager_image_tag is defined
       - gardener_networking_calico_image_tag is defined

diff --git a/control-plane/roles/gardener/templates/extension-provider-metal/controller-deployment.yaml b/control-plane/roles/gardener/templates/extension-provider-metal/controller-deployment.yaml
@@ -72,10 +72,6 @@ providerConfig:
         sourceRepository: https://github.com/metal-stack/droptailer
         repository: {{ droptailer_image_name }}
         tag: {{ droptailer_image_tag }}
-      - name: machine-controller-manager
-        sourceRepository: github.com/gardener/machine-controller-manager
-        repository: {{ gardener_machine_controller_manager_image_name }}
-        tag: {{ gardener_machine_controller_manager_image_tag }}
       - name: firewall-controller-manager
         sourceRepository: github.com/metal-stack/firewall-controller-manager
         repository: {{ firewall_controller_manager_image_name }}

diff --git a/defaults/main.yaml b/defaults/main.yaml
@@ -54,8 +54,6 @@ metal_stack_release:
     gardener_extension_provider_metal_repo_url: "docker-images.metal-stack.gardener.gardener-extension-provider-metal.repository"
     gardener_os_controller_image_tag: "docker-images.metal-stack.gardener.os-metal-extension.tag"
     gardener_os_controller_image_name: "docker-images.metal-stack.gardener.os-metal-extension.name"
-    gardener_machine_controller_manager_image_tag: "docker-images.metal-stack.gardener.machine-controller-manager.tag"
-    gardener_machine_controller_manager_image_name: "docker-images.metal-stack.gardener.machine-controller-manager.name"
     gardener_mcm_provider_metal_image_name: "docker-images.metal-stack.gardener.machine-controller-manager-provider-metal.name"
     gardener_mcm_provider_metal_image_tag: "docker-images.metal-stack.gardener.machine-controller-manager-provider-metal.tag"
     gardener_extension_audit_image_name: "docker-images.metal-stack.gardener.gardener-extension-audit.name"