From 851d057ed16f067dfc49b35c230c36ac9730f0e0 Mon Sep 17 00:00:00 2001 From: Kurt Garloff Date: Fri, 6 Sep 2024 13:54:21 +0200 Subject: [PATCH 1/2] Use mand SCS flavors in scs cluster-class template. * Use SCS-2V-4-20s (note the s) as example and default for control plane nodes. We have created the small SSD flavors for exactly this use case, so let's use them. Also note that SCS-2V-4-20 is no longer guaranteed to exist on every SCS (IaaS-compatible-v3+) cloud. * Likewise shift to SCS-2V-4 (diskless) as default for the worker nodes. This flavor is guaranteed to exist. It will require a root volume, suggest 25GiB. * Clarify comments on when to use root volumes ... Signed-off-by: Kurt Garloff --- .../cluster-class/templates/cluster-class.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/providers/openstack/scs/cluster-class/templates/cluster-class.yaml b/providers/openstack/scs/cluster-class/templates/cluster-class.yaml index e710a2ea..6935dfa3 100644 --- a/providers/openstack/scs/cluster-class/templates/cluster-class.yaml +++ b/providers/openstack/scs/cluster-class/templates/cluster-class.yaml @@ -46,16 +46,16 @@ spec: schema: openAPIV3Schema: type: string - default: "SCS-2V-4-20" - example: "SCS-2V-4-20" + default: "SCS-2V-4-20s" + example: "SCS-2V-4-20s" description: "OpenStack instance flavor for control-plane nodes." - name: worker_flavor required: false schema: openAPIV3Schema: type: string - default: "SCS-2V-4-20" - example: "SCS-2V-4-20" + default: "SCS-2V-4" + example: "SCS-2V-4" description: "OpenStack instance flavor for worker nodes." - name: controller_root_disk required: false @@ -63,16 +63,16 @@ spec: openAPIV3Schema: type: integer minimum: 1 - example: 20 - description: "Root disk size in GiB for control-plane nodes. OpenStack volume will be created and used instead of an ephemeral disk defined in flavor. Should be used also for the diskless flavors." + example: 25 + description: "Root disk size in GiB for control-plane nodes. OpenStack volume will be created and used instead of an ephemeral disk defined in flavor. Should only be used for the diskless flavors." - name: worker_root_disk required: false schema: openAPIV3Schema: type: integer minimum: 1 - example: 20 - description: "Root disk size in GiB for worker nodes. OpenStack volume will be created and used instead of an ephemeral disk defined in flavor. Should be used also for the diskless flavors." + example: 25 + description: "Root disk size in GiB for worker nodes. OpenStack volume will be created and used instead of an ephemeral disk defined in flavor. Should be used for the diskless flavors." - name: yawol_flavor_id required: false schema: From c623fb453b720168e3db7f1a13a849c108df2ec8 Mon Sep 17 00:00:00 2001 From: Jan Schoone <6106846+jschoone@users.noreply.github.com> Date: Tue, 10 Sep 2024 17:56:32 +0200 Subject: [PATCH 2/2] Update providers/openstack/scs/cluster-class/templates/cluster-class.yaml Co-authored-by: Roman Hros Signed-off-by: Jan Schoone <6106846+jschoone@users.noreply.github.com> --- .../openstack/scs/cluster-class/templates/cluster-class.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/providers/openstack/scs/cluster-class/templates/cluster-class.yaml b/providers/openstack/scs/cluster-class/templates/cluster-class.yaml index 6935dfa3..65303efa 100644 --- a/providers/openstack/scs/cluster-class/templates/cluster-class.yaml +++ b/providers/openstack/scs/cluster-class/templates/cluster-class.yaml @@ -71,6 +71,7 @@ spec: openAPIV3Schema: type: integer minimum: 1 + default: 25 example: 25 description: "Root disk size in GiB for worker nodes. OpenStack volume will be created and used instead of an ephemeral disk defined in flavor. Should be used for the diskless flavors." - name: yawol_flavor_id