From 44cd61356d757a77071ccf42a98b0c4f0183d476 Mon Sep 17 00:00:00 2001 From: Kurt Garloff Date: Wed, 11 Sep 2024 00:45:30 +0200 Subject: [PATCH] Use mand SCS flavors in scs cluster-class template. (#174) * 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 * 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> --------- Signed-off-by: Kurt Garloff Signed-off-by: Jan Schoone <6106846+jschoone@users.noreply.github.com> Co-authored-by: Jan Schoone <6106846+jschoone@users.noreply.github.com> Co-authored-by: Roman Hros --- .../cluster-class/templates/cluster-class.yaml | 17 +++++++++-------- 1 file changed, 9 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..65303efa 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,17 @@ 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." + 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 required: false schema: