Allow deploying gardener-extension-networking-calico v1.40.0 (#354)

metal-stack · Nov 18, 2024 · 6466817 · 6466817
1 parent 7760071
commit 6466817
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 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
@@ -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
@@ -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
@@ -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