Merge branch 'main' into feat/use-clouds

Author: garloff

hack/generate_version.py

@@ -19,6 +19,7 @@
 from pathlib import Path, PosixPath
 
 import yaml
+import requests
 
 BASE_PATH = Path(__file__).parent.parent
 SOURCE_PATH = BASE_PATH.joinpath("providers", "openstack", "scs")
@@ -238,12 +239,18 @@ def update_node_images(target: PosixPath, **kwargs):
 
     # TODO: can this magic URL be 'removed'?
     # pylint: disable=locally-disabled, line-too-long
-    url = f'https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v{kwargs["kubernetes"][0:4]}/ubuntu-2204-kube-v{kwargs["kubernetes"]}.qcow2'
-    content["openStackNodeImages"][0]["url"] = url
+    url = f"https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v{kwargs['kubernetes'][0:4]}/ubuntu-2204-kube-v{kwargs['kubernetes']}.qcow2"
+    content["spec"]["resource"]["content"]["download"]["url"] = url
 
-    content["openStackNodeImages"][0]["createOpts"][
-        "name"
-    ] = f"ubuntu-capi-image-v{kwargs['kubernetes']}"
+    checksum_url = f"{url}.CHECKSUM"
+    response = requests.get(checksum_url, timeout=30)
+    response.raise_for_status()
+
+    checksum_line = response.text.strip()
+    checksum = checksum_line.split()[0]
+
+    content["spec"]["resource"]["content"]["download"]["hash"]["value"] = checksum
+    logger.info("Updated checksum: %s", checksum)
 
     writefile(target, content)
 
@@ -297,4 +304,6 @@ def update_node_images(target: PosixPath, **kwargs):
           )
         update_csctl_conf(output_dir.joinpath("csctl.yaml"), **tv)
         update_cluster_class(output_dir.joinpath("cluster-class"), **tv)
-        update_node_images(output_dir.joinpath("node-images", "config.yaml"), **tv)
+        update_node_images(
+            output_dir.joinpath("cluster-class", "templates", "image.yaml"), **tv
+        )

providers/openstack/scs/cluster-addon/cni/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: cilium
   repository: https://helm.cilium.io/
-  version: 1.17.2
-digest: sha256:50ad7512444f79ac3180a9c1f33ed38b352a5241f2602ff6a023665bdb11363d
-generated: "2025-04-07T22:09:00.709068531+02:00"
+  version: 1.17.4
+digest: sha256:bbf6df8f80e3eef4e48b2f767734b19ec0c69aa23afc12f5a2f04587383ef089
+generated: "2025-05-28T20:26:29.333212374+02:00"

providers/openstack/scs/cluster-addon/cni/Chart.yaml

@@ -7,4 +7,4 @@ dependencies:
   - alias: cilium
     name: cilium
     repository: https://helm.cilium.io/
-    version: 1.17.2
+    version: 1.17.4

providers/openstack/scs/cluster-addon/cni/charts/cilium-1.17.2.tgz

@@ -0,0 +1,124 @@
+# Cluster Stacks
+
+## Getting started
+
+```sh
+# Create bootstrap cluster
+kind create cluster
+
+# Init Cluster API
+export CLUSTER_TOPOLOGY=true
+export EXP_CLUSTER_RESOURCE_SET=true
+export EXP_RUNTIME_SDK=true
+kubectl apply -f https://github.com/k-orc/openstack-resource-controller/releases/latest/download/install.yaml
+clusterctl init --infrastructure openstack
+
+kubectl -n capi-system rollout status deployment
+kubectl -n capo-system rollout status deployment
+```
+
+```
+# Install CSO and CSPO
+helm upgrade -i cso \
+-n cso-system \
+--create-namespace \
+oci://registry.scs.community/cluster-stacks/cso
+```
+
+```sh
+export CLUSTER_NAMESPACE=cluster
+export CLUSTER_NAME=my-cluster
+export CLUSTERSTACK_NAMESPACE=cluster
+export CLUSTERSTACK_VERSION=v1
+export OS_CLIENT_CONFIG_FILE=${PWD}/clouds.yaml
+kubectl create namespace $CLUSTER_NAMESPACE --dry-run=client -o yaml | kubectl apply -f -
+```
+
+```sh
+# Create secret for CAPO
+kubectl create secret -n $CLUSTER_NAMESPACE generic openstack --from-file=clouds.yaml=$OS_CLIENT_CONFIG_FILE --dry-run=client -oyaml | kubectl apply -f -
+
+# Prepare the Secret as it will be deployed in the Workload Cluster
+kubectl create secret -n kube-system generic clouds-yaml --from-file=clouds.yaml=$OS_CLIENT_CONFIG_FILE --dry-run=client -oyaml > clouds-yaml-secret
+
+# Add the Secret to the ClusterResourceSet Secret in the Management Cluster
+kubectl create -n $CLUSTER_NAMESPACE secret generic clouds-yaml --from-file=clouds-yaml-secret --type=addons.cluster.x-k8s.io/resource-set --dry-run=client -oyaml | kubectl apply -f -
+```
+
+```yaml
+cat <<EOF | kubectl apply -f -
+apiVersion: addons.cluster.x-k8s.io/v1beta1
+kind: ClusterResourceSet
+metadata:
+  name: clouds-yaml
+  namespace: $CLUSTER_NAMESPACE
+spec:
+  strategy: "Reconcile"
+  clusterSelector:
+    matchLabels:
+      managed-secret: clouds-yaml
+  resources:
+    - name: clouds-yaml
+      kind: Secret
+EOF
+```
+
+```sh
+# Apply ClusterStack resource
+cat <<EOF | kubectl apply -f -
+apiVersion: clusterstack.x-k8s.io/v1alpha1
+kind: ClusterStack
+metadata:
+  name: openstack
+  namespace: $CLUSTERSTACK_NAMESPACE
+spec:
+  provider: openstack
+  name: scs2
+  kubernetesVersion: "1.33"
+  channel: stable
+  autoSubscribe: false
+  noProvider: true
+  versions:
+    - $CLUSTERSTACK_VERSION
+EOF
+```
+
+```sh
+# Apply Cluster resource
+cat <<EOF | kubectl apply -f -
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: $CLUSTER_NAME
+  namespace: $CLUSTER_NAMESPACE
+
+  labels:
+    managed-secret: clouds-yaml
+spec:
+  clusterNetwork:
+    pods:
+      cidrBlocks:
+      - "172.16.0.0/16"
+    serviceDomain: cluster.local
+    services:
+      cidrBlocks:
+      - "10.96.0.0/12"
+  topology:
+    variables:
+    class: openstack-scs2-1-33-$CLUSTERSTACK_VERSION
+    classNamespace: $CLUSTERSTACK_NAMESPACE
+    controlPlane:
+      replicas: 1
+    version: v1.33.4
+    workers:
+      machineDeployments:
+        - class: default-worker
+          name: md-0
+          replicas: 1
+EOF
+```
+
+```sh
+clusterctl get kubeconfig -n $CLUSTER_NAMESPACE openstack-testcluster > /tmp/kubeconfig
+kubectl get nodes --kubeconfig /tmp/kubeconfig
+```

providers/openstack/scs/cluster-addon/cni/charts/cilium-1.17.4.tgz

@@ -0,0 +1,10 @@
+apiVersion: v2
+type: application
+description: CCM
+name: CCM
+version: v1
+dependencies:
+  - alias: openstack-cloud-controller-manager
+    name: openstack-cloud-controller-manager
+    repository: https://kubernetes.github.io/cloud-provider-openstack
+    version: 2.33.1

providers/openstack/scs2/README.md

@@ -0,0 +1,4 @@
+values: |
+  openstack-cloud-controller-manager:
+    cluster:
+      name: {{ .Cluster.metadata.name }}

providers/openstack/scs2/cluster-addon/ccm/Chart.yaml

@@ -0,0 +1,21 @@
+openstack-cloud-controller-manager:
+  secret:
+    enabled: true
+    name: ccm-cloud-config
+    create: true
+  nodeSelector:
+  tolerations:
+    - key: node.cloudprovider.kubernetes.io/uninitialized
+      value: "true"
+      effect: NoSchedule
+  extraVolumes:
+    - name: clouds-yaml
+      secret:
+        secretName: clouds-yaml
+  extraVolumeMounts:
+    - name: clouds-yaml
+      readOnly: true
+      mountPath: /etc/openstack
+  cloudConfig:
+    global:
+      use-clouds: true

providers/openstack/scs2/cluster-addon/ccm/overwrite.yaml

@@ -0,0 +1,10 @@
+apiVersion: v2
+type: application
+description: CNI
+name: CNI
+version: v1
+dependencies:
+  - alias: cilium
+    name: cilium
+    repository: https://helm.cilium.io/
+    version: 1.18.1