From 8bd8fa78865c806d0a5da5cdf22e4fcdfb5d8eba Mon Sep 17 00:00:00 2001 From: Gerrit Date: Wed, 23 Oct 2024 09:36:33 +0200 Subject: [PATCH] Gardener v1.96. --- .../extension-provider-metal/controller-deployment.yaml | 7 +++---- .../templates/networking-cilium/controller-deployment.yaml | 2 +- .../os-metal-extension/controller-deployment.yaml | 6 +++--- .../templates/provider-gcp/controller-deployment.yaml | 7 +++---- 4 files changed, 10 insertions(+), 12 deletions(-) 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 index 4010ed0b2..1d56cb3f8 100644 --- a/control-plane/roles/gardener/templates/extension-provider-metal/controller-deployment.yaml +++ b/control-plane/roles/gardener/templates/extension-provider-metal/controller-deployment.yaml @@ -1,11 +1,10 @@ --- -apiVersion: core.gardener.cloud/v1beta1 +apiVersion: core.gardener.cloud/v1 kind: ControllerDeployment metadata: name: provider-metal -type: helm -providerConfig: - chart: "{{ (lookup('url', 'https://raw.githubusercontent.com/metal-stack/gardener-extension-provider-metal/' + gardener_extension_provider_metal_repo_ref + '/example/controller-registration.yaml', split_lines=False) | from_yaml_all | list)[0].providerConfig.chart }}" +helm: + rawChart: "{{ (lookup('url', 'https://raw.githubusercontent.com/metal-stack/gardener-extension-provider-metal/' + gardener_extension_provider_metal_repo_ref + '/example/controller-registration.yaml', split_lines=False) | from_yaml_all | list)[0].helm.rawChart }}" values: image: repository: "{{ gardener_extension_provider_metal_image_name }}" diff --git a/control-plane/roles/gardener/templates/networking-cilium/controller-deployment.yaml b/control-plane/roles/gardener/templates/networking-cilium/controller-deployment.yaml index 0e832f650..e620be21a 100644 --- a/control-plane/roles/gardener/templates/networking-cilium/controller-deployment.yaml +++ b/control-plane/roles/gardener/templates/networking-cilium/controller-deployment.yaml @@ -15,4 +15,4 @@ providerConfig: imageVectorOverwrite: | images: {{ gardener_extension_networking_cilium_image_vector_overwrite | to_nice_yaml(indent=2) | indent(width=8, first=false) }} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/control-plane/roles/gardener/templates/os-metal-extension/controller-deployment.yaml b/control-plane/roles/gardener/templates/os-metal-extension/controller-deployment.yaml index 9b4c8cd04..03f37294c 100644 --- a/control-plane/roles/gardener/templates/os-metal-extension/controller-deployment.yaml +++ b/control-plane/roles/gardener/templates/os-metal-extension/controller-deployment.yaml @@ -1,11 +1,11 @@ --- -apiVersion: core.gardener.cloud/v1beta1 +apiVersion: core.gardener.cloud/v1 kind: ControllerDeployment metadata: name: os-metal type: helm -providerConfig: - chart: "{{ (lookup('url', 'https://raw.githubusercontent.com/metal-stack/os-metal-extension/' + gardener_os_controller_repo_ref + '/example/controller-registration.yaml', split_lines=False) | from_yaml_all | list)[0].providerConfig.chart }}" +helm: + rawChart: "{{ (lookup('url', 'https://raw.githubusercontent.com/metal-stack/os-metal-extension/' + gardener_os_controller_repo_ref + '/example/controller-registration.yaml', split_lines=False) | from_yaml_all | list)[0].helm.rawChart }}" values: image: repository: "{{ gardener_os_controller_image_name }}" diff --git a/control-plane/roles/gardener/templates/provider-gcp/controller-deployment.yaml b/control-plane/roles/gardener/templates/provider-gcp/controller-deployment.yaml index fa2375087..dc3205584 100644 --- a/control-plane/roles/gardener/templates/provider-gcp/controller-deployment.yaml +++ b/control-plane/roles/gardener/templates/provider-gcp/controller-deployment.yaml @@ -1,11 +1,10 @@ --- -apiVersion: core.gardener.cloud/v1beta1 +apiVersion: core.gardener.cloud/v1 kind: ControllerDeployment metadata: name: provider-gcp -type: helm -providerConfig: - chart: "{{ (lookup('url', 'https://raw.githubusercontent.com/gardener/gardener-extension-provider-gcp/' + gardener_extension_provider_gcp_image_tag + '/example/controller-registration.yaml', split_lines=False) | from_yaml_all | list)[0].providerConfig.chart }}" +helm: + rawChart: "{{ (lookup('url', 'https://raw.githubusercontent.com/gardener/gardener-extension-provider-gcp/' + gardener_extension_provider_gcp_image_tag + '/example/controller-registration.yaml', split_lines=False) | from_yaml_all | list)[0].helm.rawChart }}" values: image: tag: {{ gardener_extension_provider_gcp_image_tag }}