Bugfix: use 3 worker nodes for kaas testing (#939)

Also, increase timeout yet again,
although I hope it will be quicker with more workers...

Signed-off-by: Matthias Büchse <[email protected]>

Author: mbuechse

.zuul.d/config.yaml

@@ -62,7 +62,7 @@
     # timeout:
     # a) these tests take a lot of time, I'm afraid, particularly Sonobuoy
     # b) keep in mind that this job covers ALL test subjects (at most 4 in parallel)
-    timeout: 18000  # 5 hrs -- 2.5 hrs was not enough
+    timeout: 21600  # 6 hrs -- 5 hrs was almost sufficient (reports came through sometimes)
     vars:
       preset: kaas
       iaas: false

Tests/kaas/plugin/plugin_clusterstacks.py

@@ -157,6 +157,10 @@ def _auto_vars_syself(self, api_instance: _csh.CustomObjectsApi):
         return {'cs_class_name': cs_class_name, 'cs_version': cs_version}
 
     def _auto_vars(self, auto_vars_kind, co_api: _csh.CustomObjectsApi):
+        # set default values regardless of auto_vars_kind
+        self.vars.setdefault('num_control_nodes', 3)
+        self.vars.setdefault('num_worker_nodes', 3)
+        # now on to specifics
         if not auto_vars_kind:
             return
         if auto_vars_kind == 'syself':

playbooks/.config/scs/syself-cluster.yaml

@@ -16,12 +16,12 @@ spec:
     class: '{{ cs_class_name }}'
     version: '{{ cs_version }}'
     controlPlane:
-      replicas: 3
+      replicas: {{ num_control_nodes }}
     workers:
       machineDeployments:
         - class: workeramd64hcloud
           name: md-0
-          replicas: 1
+          replicas: {{ num_worker_nodes }}
           failureDomain: nbg1
           variables:
             overrides:

playbooks/clusters.yaml.j2

@@ -12,6 +12,8 @@ clusters:
         kubeconfig: syself-kubeconfig.yaml
       vars:
         cs_name: hetzner-apalla-1-32
+        num_control_nodes: 3
+        num_worker_nodes: 3
       secrets:
         token: "{{ clouds_conf.syself_token }}"
   syself-1.31:
@@ -26,6 +28,8 @@ clusters:
         kubeconfig: syself-kubeconfig.yaml
       vars:
         cs_name: hetzner-apalla-1-31
+        num_control_nodes: 3
+        num_worker_nodes: 3
       secrets:
         token: "{{ clouds_conf.syself_token }}"
   syself-1.30:
@@ -40,6 +44,8 @@ clusters:
         kubeconfig: syself-kubeconfig.yaml
       vars:
         cs_name: hetzner-apalla-1-30
+        num_control_nodes: 3
+        num_worker_nodes: 3
       secrets:
         token: "{{ clouds_conf.syself_token }}"
   # dev clusters using kind