diff --git a/providers/openstack/scs/README.md b/providers/openstack/scs/README.md new file mode 100644 index 00000000..6533d842 --- /dev/null +++ b/providers/openstack/scs/README.md @@ -0,0 +1,120 @@ +# 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 + +``` + +values.yaml + +``` +clusterStackVariables: + ociRepository: registry.scs.community/kaas/cluster-stacks +controllerManager: + rbac: + additionalRules: + - apiGroups: + - "openstack.k-orc.cloud" + resources: + - "images" + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +``` + +``` +# Install CSO and CSPO +helm upgrade -i cso \ +-n cso-system \ +--create-namespace \ +oci://registry.scs.community/cluster-stacks/cso \ +--values values.yaml + +kubectl create namespace cluster +``` + +``` +# Add secret using csp-helper chart +helm upgrade -i openstack-secrets -n cluster --create-namespace https://github.com/SovereignCloudStack/openstack-csp-helper/releases/latest/download/openstack-csp-helper.tgz -f +``` + +```sh +cat < /tmp/kubeconfig +kubectl get nodes --kubeconfig /tmp/kubeconfig +``` diff --git a/providers/openstack/scs/cluster-class/Chart.yaml b/providers/openstack/scs/cluster-class/Chart.yaml index 901b5d93..fa6d1f5d 100644 --- a/providers/openstack/scs/cluster-class/Chart.yaml +++ b/providers/openstack/scs/cluster-class/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -description: 'This chart installs and configures: +description: "This chart installs and configures: * Openstack scs Cluster Class - ' -name: openstack-scs-1-30-cluster-class + " +name: openstack-scs-1-32-cluster-class type: application version: v1 diff --git a/providers/openstack/scs/cluster-class/templates/image.yaml b/providers/openstack/scs/cluster-class/templates/image.yaml new file mode 100644 index 00000000..e515484b --- /dev/null +++ b/providers/openstack/scs/cluster-class/templates/image.yaml @@ -0,0 +1,21 @@ +--- +apiVersion: openstack.k-orc.cloud/v1alpha1 +kind: Image +metadata: + name: "{{ .Values.images.worker.name }}" +spec: + cloudCredentialsRef: + cloudName: "{{ .Values.identityRef.cloudName }}" + secretName: "{{ .Values.identityRef.name }}" + managementPolicy: managed + resource: + properties: + diskBus: "scsi" + scsiModel: "virtio-scsi" + content: + diskFormat: qcow2 + download: + url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.32/ubuntu-2204-kube-v1.32.1.qcow2 + hash: + algorithm: sha256 + value: 1d261cd043f1c16a676be9079984c912df82387be4c6766b122a966e266a080c diff --git a/providers/openstack/scs/cluster-class/values.yaml b/providers/openstack/scs/cluster-class/values.yaml index 779f0fce..98e63587 100644 --- a/providers/openstack/scs/cluster-class/values.yaml +++ b/providers/openstack/scs/cluster-class/values.yaml @@ -7,9 +7,9 @@ openstack_loadbalancer_apiserver: false # TBD, currently needed: images: controlPlane: - name: ubuntu-capi-image-v1.30.9 + name: ubuntu-capi-image-v1.32.1 worker: - name: ubuntu-capi-image-v1.30.9 + name: ubuntu-capi-image-v1.32.1 identityRef: name: openstack cloudName: openstack diff --git a/providers/openstack/scs/csctl.yaml b/providers/openstack/scs/csctl.yaml index 0d022ef2..909bd097 100644 --- a/providers/openstack/scs/csctl.yaml +++ b/providers/openstack/scs/csctl.yaml @@ -1,9 +1,7 @@ apiVersion: csctl.clusterstack.x-k8s.io/v1alpha1 config: clusterStackName: scs - kubernetesVersion: v1.30.9 + kubernetesVersion: v1.32.1 provider: apiVersion: openstack.csctl.clusterstack.x-k8s.io/v1alpha1 - config: - method: get type: openstack diff --git a/providers/openstack/scs/node-images/config.yaml b/providers/openstack/scs/node-images/config.yaml deleted file mode 100644 index 8c33ea11..00000000 --- a/providers/openstack/scs/node-images/config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: openstack.infrastructure.clusterstack.x-k8s.io/v1alpha1 -openStackNodeImages: - - createOpts: - container_format: bare - disk_format: qcow2 - name: ubuntu-capi-image-v1.30.9 - visibility: private - url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.30/ubuntu-2204-kube-v1.30.9.qcow2 diff --git a/providers/openstack/scs/versions.yaml b/providers/openstack/scs/versions.yaml index 788b9325..f56a9370 100644 --- a/providers/openstack/scs/versions.yaml +++ b/providers/openstack/scs/versions.yaml @@ -1,9 +1,9 @@ -- kubernetes: 1.30.9 +- kubernetes: 1.30.11 cinder_csi: 2.30.3 occm: 2.30.5 -- kubernetes: 1.31.6 +- kubernetes: 1.31.7 cinder_csi: 2.31.7 occm: 2.31.3 -- kubernetes: 1.32.1 +- kubernetes: 1.32.3 cinder_csi: 2.32.0 occm: 2.32.0