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 cf1c6ea0..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,11 +1,10 @@ --- -apiVersion: core.gardener.cloud/v1beta1 +apiVersion: core.gardener.cloud/v1 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..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,13 +13,12 @@ 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 -type: helm -providerConfig: - chart: a-chart +helm: + rawChart: a-chart values: image: tag: v1.48.0 @@ -50,13 +49,12 @@ 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 -type: helm -providerConfig: - chart: "a-chart" +helm: + rawChart: "a-chart" values: image: repository: "extension-image"