From 77600711971af0322c23105f8cc5a27b9e29af2e Mon Sep 17 00:00:00 2001 From: Robert Volkmann <20912167+robertvolkmann@users.noreply.github.com> Date: Mon, 18 Nov 2024 12:50:43 +0100 Subject: [PATCH 1/2] Allow deploying gardener-extension-shoot-dns-service v1.50.0 (#353) --- .../shoot-dns-service/controller-deployment.yaml | 5 ++--- .../roles/gardener/test/dns_extension_template_test.py | 10 ++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/control-plane/roles/gardener/templates/shoot-dns-service/controller-deployment.yaml b/control-plane/roles/gardener/templates/shoot-dns-service/controller-deployment.yaml index cf1c6ea0..63f7a1cd 100644 --- a/control-plane/roles/gardener/templates/shoot-dns-service/controller-deployment.yaml +++ b/control-plane/roles/gardener/templates/shoot-dns-service/controller-deployment.yaml @@ -3,9 +3,8 @@ apiVersion: core.gardener.cloud/v1beta1 kind: ControllerDeployment metadata: name: extension-shoot-dns-service -type: helm -providerConfig: - chart: "{{ (lookup('url', 'https://raw.githubusercontent.com/' + gardener_shoot_dns_service_repo_ref + '/example/controller-registration.yaml', split_lines=False) | from_yaml_all | list)[0].providerConfig.chart }}" +helm: + rawChart: "{{ (lookup('url', 'https://raw.githubusercontent.com/' + gardener_shoot_dns_service_repo_ref + '/example/controller-registration.yaml', split_lines=False) | from_yaml_all | list)[0].helm.rawChart }}" values: image: repository: "{{ gardener_shoot_dns_service_image_name }}" diff --git a/control-plane/roles/gardener/test/dns_extension_template_test.py b/control-plane/roles/gardener/test/dns_extension_template_test.py index 72d10fed..86915633 100644 --- a/control-plane/roles/gardener/test/dns_extension_template_test.py +++ b/control-plane/roles/gardener/test/dns_extension_template_test.py @@ -17,9 +17,8 @@ def test_shoot_dns_extension_controller_deployment_template(self, mock_urlopen): kind: ControllerDeployment metadata: name: extension-shoot-dns-service -type: helm -providerConfig: - chart: a-chart +helm: + rawChart: a-chart values: image: tag: v1.48.0 @@ -54,9 +53,8 @@ def test_shoot_dns_extension_controller_deployment_template(self, mock_urlopen): kind: ControllerDeployment metadata: name: extension-shoot-dns-service -type: helm -providerConfig: - chart: "a-chart" +helm: + rawChart: "a-chart" values: image: repository: "extension-image" From 64668177544c1f83f727728d497a4146a95b36da Mon Sep 17 00:00:00 2001 From: Gerrit Date: Mon, 18 Nov 2024 13:30:16 +0100 Subject: [PATCH 2/2] Allow deploying gardener-extension-networking-calico v1.40.0 (#354) --- .../templates/networking-calico/controller-deployment.yaml | 7 +++---- .../templates/shoot-dns-service/controller-deployment.yaml | 2 +- .../roles/gardener/test/dns_extension_template_test.py | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/control-plane/roles/gardener/templates/networking-calico/controller-deployment.yaml b/control-plane/roles/gardener/templates/networking-calico/controller-deployment.yaml index a8175953..dce6d722 100644 --- a/control-plane/roles/gardener/templates/networking-calico/controller-deployment.yaml +++ b/control-plane/roles/gardener/templates/networking-calico/controller-deployment.yaml @@ -1,11 +1,10 @@ --- -apiVersion: core.gardener.cloud/v1beta1 +apiVersion: core.gardener.cloud/v1 kind: ControllerDeployment metadata: name: networking-calico -type: helm -providerConfig: - chart: "{{ (lookup('url', 'https://raw.githubusercontent.com/gardener/gardener-extension-networking-calico/' + gardener_networking_calico_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-networking-calico/' + gardener_networking_calico_image_tag + '/example/controller-registration.yaml', split_lines=False) | from_yaml_all | list)[0].helm.rawChart }}" values: image: repository: "{{ gardener_networking_calico_image_name }}" diff --git a/control-plane/roles/gardener/templates/shoot-dns-service/controller-deployment.yaml b/control-plane/roles/gardener/templates/shoot-dns-service/controller-deployment.yaml index 63f7a1cd..6c508c6b 100644 --- a/control-plane/roles/gardener/templates/shoot-dns-service/controller-deployment.yaml +++ b/control-plane/roles/gardener/templates/shoot-dns-service/controller-deployment.yaml @@ -1,5 +1,5 @@ --- -apiVersion: core.gardener.cloud/v1beta1 +apiVersion: core.gardener.cloud/v1 kind: ControllerDeployment metadata: name: extension-shoot-dns-service diff --git a/control-plane/roles/gardener/test/dns_extension_template_test.py b/control-plane/roles/gardener/test/dns_extension_template_test.py index 86915633..299b8745 100644 --- a/control-plane/roles/gardener/test/dns_extension_template_test.py +++ b/control-plane/roles/gardener/test/dns_extension_template_test.py @@ -13,7 +13,7 @@ def test_shoot_dns_extension_controller_deployment_template(self, mock_urlopen): cm.getcode.return_value = 200 cm.read.return_value = ''' --- -apiVersion: core.gardener.cloud/v1beta1 +apiVersion: core.gardener.cloud/v1 kind: ControllerDeployment metadata: name: extension-shoot-dns-service @@ -49,7 +49,7 @@ def test_shoot_dns_extension_controller_deployment_template(self, mock_urlopen): expected = ''' --- -apiVersion: core.gardener.cloud/v1beta1 +apiVersion: core.gardener.cloud/v1 kind: ControllerDeployment metadata: name: extension-shoot-dns-service