Adaptions for g/g 1.77 (#270)

metal-stack · Mar 7, 2024 · bc63610 · bc63610
1 parent 70f9a5e
commit bc63610
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/control-plane/roles/gardener/tasks/gardener.yaml b/control-plane/roles/gardener/tasks/gardener.yaml
@@ -17,6 +17,29 @@
           app: gardener
     kubeconfig: "{{ gardener_kube_apiserver_kubeconfig_path }}"
 
+- name: Deploy domain secrets (in virtual apiserver)
+  k8s:
+    definition:
+      apiVersion: v1
+      kind: Secret
+      metadata:
+        namespace: garden
+        annotations:
+          helm.sh/resource-policy: keep
+          dns.gardener.cloud/domain: "{{ gardener_dns_domain }}"
+          dns.gardener.cloud/provider: "{{ gardener_dns_provider }}"
+        labels:
+          app: gardener
+          gardener.cloud/role: "{{ item }}"
+        name: "{{ item }}-{{ gardener_dns_domain | regex_replace('\\.', '-') }}"
+      type: Opaque
+      data: "{{ gardener_dns_credentials }}"
+    kubeconfig: "{{ gardener_kube_apiserver_kubeconfig_path }}"
+    apply: true
+  loop:
+    - internal-domain
+    - default-domain
+
 - name: Deploy Gardener Control Plane (in virtual apiserver)
   include_role:
     name: ansible-common/roles/helm-chart

diff --git a/control-plane/roles/gardener/tasks/seed.yaml b/control-plane/roles/gardener/tasks/seed.yaml
@@ -121,16 +121,3 @@
       status: "True"
       type: GardenletReady
     wait_timeout: 180
-
-- name: Wait until Seed cluster has been bootstrapped successfully
-  kubernetes.core.k8s_info:
-    api_version: "core.gardener.cloud/v1beta1"
-    kind: Seed
-    name: "{{ gardener_soil_name }}"
-    kubeconfig: "{{ gardener_kube_apiserver_kubeconfig_path }}"
-    wait: yes
-    wait_condition:
-      reason: BootstrappingSucceeded
-      status: "True"
-      type: Bootstrapped
-    wait_timeout: 180
diff --git a/control-plane/roles/gardener/templates/gardener-control-plane-values.j2 b/control-plane/roles/gardener/templates/gardener-control-plane-values.j2
@@ -118,16 +118,6 @@ global:
     kubeconfig: |
       {{ gardener_kube_api_server_kubeconfig | indent(width=6, first=false) }}
 
-  internalDomain:
-    provider: "{{ gardener_dns_provider }}"
-    domain: "{{ gardener_dns_domain }}"
-    credentials: {{ gardener_dns_credentials | to_json }}
-
-  defaultDomains:
-  - provider: "{{ gardener_dns_provider }}"
-    domain: "{{ gardener_dns_domain }}"
-    credentials: {{ gardener_dns_credentials | to_json }}
-
   deployment:
    virtualGarden:
      enabled: true