Improve Gardener setup (#1230)

- allow omitting machine_image_version and do so for noris, scaleup
- allow specifying a volume via volume_size_gib and do so for noris
- account for state 'Pending' in plugin_gardener.py (observed once, seemed legit)

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

Author: mbuechse

Tests/kaas/plugin/plugin_gardener.py

@@ -116,7 +116,7 @@ def wait_for_shoot_ready(self, co_api: _gh.CustomObjectsApi):
             if state == 'Succeeded':
                 logger.debug(f'shoot {self.name} appears to be ready')
                 return
-            if state not in ('Unknown', 'Processing'):
+            if state not in ('Unknown', 'Processing', 'Pending'):
                 raise RuntimeError(f"Shoot {self.name} object in unexpected state {last_op.get('state')}")
 
             timeout = next(timeouts)

playbooks/.config/scs/shoot.yaml

@@ -23,13 +23,19 @@ spec:
         machine:
           type: {{ machine_type }}
           image:
-            name: {{ machine_image_name }}
-            version: {{ machine_image_version }}
+            name: {{ machine_image_name }}{%
+if machine_image_version | default('') %}
+            version: {{ machine_image_version }}{%
+endif %}
           architecture: amd64
         zones:
           - {{ zone }}
         cri:
-          name: containerd
+          name: containerd{%
+if volume_size_gib | default(0) %}
+        volume:
+          size: {{ volume_size_gib }}Gi{%
+endif %}
   networking:
     nodes: {{ worker_cidr }}
     type: {{ networking_type }}

playbooks/clusters.yaml.j2

@@ -13,9 +13,9 @@ clusters:
         kubernetes_version: "1.33.10"
         num_worker_nodes: 3
         worker_cidr: "10.250.0.0/16"
-        machine_type: "SCS-1V-16-50"
+        machine_type: "SCS-2V-4"
         machine_image_name: "flatcar"
-        machine_image_version: "4081.3.6"
+        volume_size_gib: 50
         networking_type: cilium
         region: "nsc-nbg"
         zone: "nbg1"
@@ -41,9 +41,9 @@ clusters:
         kubernetes_version: "1.34.6"
         num_worker_nodes: 3
         worker_cidr: "10.250.0.0/16"
-        machine_type: "SCS-1V-16-50"
+        machine_type: "SCS-2V-4"
         machine_image_name: "flatcar"
-        machine_image_version: "4081.3.6"
+        volume_size_gib: 50
         networking_type: cilium
         region: "nsc-nbg"
         zone: "nbg1"
@@ -68,9 +68,9 @@ clusters:
       vars:
         num_worker_nodes: 3
         worker_cidr: "10.250.0.0/16"
-        machine_type: "SCS-1V-16-50"
+        machine_type: "SCS-2V-4"
         machine_image_name: "flatcar"
-        machine_image_version: "4081.3.6"
+        volume_size_gib: 50
         networking_type: cilium
         region: "nsc-nbg"
         zone: "nbg1"
@@ -97,7 +97,6 @@ clusters:
         worker_cidr: "10.250.0.0/16"
         machine_type: "SCS-2V-4-40p"
         machine_image_name: "gardenlinux"
-        machine_image_version: "1877.17.0"
         networking_type: calico
         region: "RegionOne"
         zone: "az1"
@@ -124,7 +123,6 @@ clusters:
         worker_cidr: "10.250.0.0/16"
         machine_type: "SCS-2V-4-40p"
         machine_image_name: "gardenlinux"
-        machine_image_version: "1877.17.0"
         networking_type: calico
         region: "RegionOne"
         zone: "az1"
@@ -151,7 +149,6 @@ clusters:
         worker_cidr: "10.250.0.0/16"
         machine_type: "SCS-2V-4-40p"
         machine_image_name: "gardenlinux"
-        machine_image_version: "1877.17.0"
         networking_type: calico
         region: "RegionOne"
         zone: "az1"