Merge branch 'main' into docs/kamaji

Author: garloff

docs/providers/openstack/quickstart.md

@@ -55,6 +55,7 @@ Install the [envsubst](https://github.com/drone/envsubst) Go package. It is requ
 ```bash
 GOBIN=/tmp go install github.com/drone/envsubst/v2/cmd/envsubst@latest
 ```
+Note: On typical Linux distros, you will have a binary `/usr/bin/envsubst` from the gettext package that does *not* work.
 
 Get the latest CSO release version and apply CSO manifests to the management cluster.
 
@@ -205,9 +206,11 @@ spec:
   topology:
     variables:
       - name: controller_flavor
-        value: "SCS-2V-4-50"
+        value: "SCS-2V-4-20s"
       - name: worker_flavor
-        value: "SCS-2V-4-50"
+        value: "SCS-2V-4"
+      - name: worker_root_disk
+        value: 30
       - name: external_id
         value: ${CS_EXTERNAL_ID}
     class: ${CS_CLASS_NAME}

providers/openstack/kamaji/1-30/cluster-class/templates/cluster-class.yaml

@@ -70,17 +70,17 @@ spec:
     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: 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 also for the diskless flavors. Typical capi images require at least 20GB."
   - name: node_cidr
     required: false
     schema:

providers/openstack/kamaji/1-30/cluster-class/values.yaml

@@ -3,7 +3,7 @@ external_id: ebfe5546-f09f-4f42-ab54-094e457d42ec
 dns_nameservers:
 - 5.1.66.255
 - 185.150.99.255
-worker_flavor: SCS-2V-4-20
+worker_flavor: SCS-2V-4
 node_cidr: 10.8.0.0/20
 
 identityRef:

providers/openstack/scs/cluster-class/values.yaml

@@ -1,5 +1,5 @@
 # mirrored from variables.tf
-controller_flavor: SCS-2V-4-20
+controller_flavor: SCS-2V-4-20s
 worker_flavor: SCS-2V-4-20
 restrict_kubeapi: []