diff --git a/Tests/config.toml b/Tests/config.toml index 2498ebd49..42e99ed7d 100644 --- a/Tests/config.toml +++ b/Tests/config.toml @@ -41,6 +41,7 @@ scopes = [ ] subjects = [ "noris-1.34", + "scaleup-1.34", "syself-1.33", "syself-1.34", ] diff --git a/playbooks/.config/scs/shoot.yaml b/playbooks/.config/scs/shoot.yaml index 2eaa217da..1c37e8fcf 100644 --- a/playbooks/.config/scs/shoot.yaml +++ b/playbooks/.config/scs/shoot.yaml @@ -32,7 +32,7 @@ spec: name: containerd networking: nodes: {{ worker_cidr }} - type: cilium + type: {{ networking_type }} kubernetes: version: {{ kubernetes_version }} cloudProfile: diff --git a/playbooks/clusters.yaml.j2 b/playbooks/clusters.yaml.j2 index d074834b9..b0eef9d0f 100644 --- a/playbooks/clusters.yaml.j2 +++ b/playbooks/clusters.yaml.j2 @@ -16,6 +16,7 @@ clusters: machine_type: "SCS-1V-16-50" machine_image_name: "flatcar" machine_image_version: "4081.3.6" + networking_type: cilium region: "nsc-nbg" zone: "nbg1" floating_pool_name: "external" @@ -43,6 +44,7 @@ clusters: machine_type: "SCS-1V-16-50" machine_image_name: "flatcar" machine_image_version: "4081.3.6" + networking_type: cilium region: "nsc-nbg" zone: "nbg1" floating_pool_name: "external" @@ -54,6 +56,34 @@ clusters: garden_api_server: "{{ clouds_conf.noris_api_server }}" garden_ca_data: "{{ clouds_conf.noris_ca_data }}" garden_token: "{{ clouds_conf.noris_token }}" + scaleup-1.34: + kind: gardener + config: + name: 'scaleup-1-34' # explicit name because dot in name not permissible + kubernetesVersion: '1.34' + autoVars: noris # determine vars.kubernetes_version automatically using kubernetesVersion; noris works well for us + templates: + shoot: shoot.yaml + kubeconfig: garden-kubeconfig.yaml + vars: + kubernetes_version: "1.34.6" + num_worker_nodes: 3 + 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" + floating_pool_name: "external" + load_balancer_provider: "ovn" + cloud_profile_name: "openstack" + credentials_binding_name: "c70914-6-rot" + garden_namespace: "garden-xxxx" + secrets: + garden_api_server: "{{ clouds_conf.scaleup_api_server }}" + garden_ca_data: "{{ clouds_conf.scaleup_ca_data }}" + garden_token: "{{ clouds_conf.scaleup_token }}" syself-1.32: kind: clusterstacks config: