Merge branch 'main' into docs/kamaji

Author: garloff

docs/providers/openstack/quickstart.md

@@ -175,11 +175,15 @@ export CS_CLUSTER_NAME=cs-cluster
 export CS_POD_CIDR=192.168.0.0/16
 # Note: if you need more than one SERVICE_CIDR, please adjust the yaml file accordingly
 export CS_SERVICE_CIDR=10.96.0.0/12
-export CS_EXTERNAL_ID=ebfe5546-f09f-4f42-ab54-094e457d42ec # gx-scs
+export CS_EXTERNAL_ID=ebfe5546-f09f-4f42-ab54-094e457d42ec # Replace this by your external network ID
 export CS_CLASS_NAME=openstack-"${CS_NAME}"-"${CS_K8S_VERSION/./-}"-"${CS_VERSION}"
 export CS_K8S_PATCH_VERSION=6
 ```
 
+The `CS_EXTERNAL_ID` must be the UUID of your OpenStack external network, get it via
+`openstack network list --external`. If there is only one external network, you may
+get away without passing `external_id`.
+
 Create and apply `cluster.yaml` file to the management cluster.
 
 Depending on your cluster-class and cluster addons, some more variables may have to be provided in the `spec.topology.variables` list.

hack/generate_version.py

@@ -153,7 +153,7 @@ def update_cluster_addon(
             dep["version"] = versions["occm"]
 
     content["name"] = (
-        f"openstack-scs-{get_dash_version(versions["kubernetes"])}-cluster-addon"
+        f"openstack-scs-{get_dash_version(versions['kubernetes'])}-cluster-addon"
     )
 
     writefile(target, content)
@@ -214,8 +214,8 @@ def update_cluster_class(target: PosixPath, **kwargs):
 
     content["images"]["controlPlane"][
         "name"
-    ] = f"ubuntu-capi-image-v{kwargs["kubernetes"]}"
-    content["images"]["worker"]["name"] = f"ubuntu-capi-image-v{kwargs["kubernetes"]}"
+    ] = f"ubuntu-capi-image-v{kwargs['kubernetes']}"
+    content["images"]["worker"]["name"] = f"ubuntu-capi-image-v{kwargs['kubernetes']}"
 
     writefile(values_file, content)
 
@@ -241,7 +241,7 @@ def update_node_images(target: PosixPath, **kwargs):
 
     content["openStackNodeImages"][0]["createOpts"][
         "name"
-    ] = f"ubuntu-capi-image-v{kwargs["kubernetes"]}"
+    ] = f"ubuntu-capi-image-v{kwargs['kubernetes']}"
 
     writefile(target, content)
 
@@ -272,7 +272,7 @@ def update_node_images(target: PosixPath, **kwargs):
     if args.list:
         print("Supported Kubernetes Versions:")
         for v in sup_versions:
-            print(f"{".".join(v["kubernetes"].split(".")[0:2])}")
+            print(f"{'.'.join(v['kubernetes'].split('.')[0:2])}")
         print("Usage: generate_version.py --target-version VERSION")
         sys.exit()