Skip to content

Commit fe3f4a8

Browse files
committed
Merge branch 'main' into ci-automation_issues727
2 parents f3fb168 + 5100655 commit fe3f4a8

File tree

6 files changed

+146
-15
lines changed

6 files changed

+146
-15
lines changed

providers/openstack/scs/README.md

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
# Cluster Stacks
2+
3+
## Getting started
4+
5+
```sh
6+
# Create bootstrap cluster
7+
kind create cluster
8+
9+
# Init Cluster API
10+
export CLUSTER_TOPOLOGY=true
11+
export EXP_CLUSTER_RESOURCE_SET=true
12+
export EXP_RUNTIME_SDK=true
13+
kubectl apply -f https://github.com/k-orc/openstack-resource-controller/releases/latest/download/install.yaml
14+
clusterctl init --infrastructure openstack
15+
16+
kubectl -n capi-system rollout status deployment
17+
kubectl -n capo-system rollout status deployment
18+
19+
```
20+
21+
values.yaml
22+
23+
```
24+
clusterStackVariables:
25+
ociRepository: registry.scs.community/kaas/cluster-stacks
26+
controllerManager:
27+
rbac:
28+
additionalRules:
29+
- apiGroups:
30+
- "openstack.k-orc.cloud"
31+
resources:
32+
- "images"
33+
verbs:
34+
- create
35+
- delete
36+
- get
37+
- list
38+
- patch
39+
- update
40+
- watch
41+
```
42+
43+
```
44+
# Install CSO and CSPO
45+
helm upgrade -i cso \
46+
-n cso-system \
47+
--create-namespace \
48+
oci://registry.scs.community/cluster-stacks/cso \
49+
--values values.yaml
50+
51+
kubectl create namespace cluster
52+
```
53+
54+
```
55+
# Add secret using csp-helper chart
56+
helm upgrade -i openstack-secrets -n cluster --create-namespace https://github.com/SovereignCloudStack/openstack-csp-helper/releases/latest/download/openstack-csp-helper.tgz -f <PATH TO CLOUDS YAML>
57+
```
58+
59+
```sh
60+
cat <<EOF | kubectl apply -f -
61+
apiVersion: clusterstack.x-k8s.io/v1alpha1
62+
kind: ClusterStack
63+
metadata:
64+
name: openstack
65+
namespace: cluster
66+
spec:
67+
provider: openstack
68+
name: scs
69+
kubernetesVersion: "1.32"
70+
channel: custom
71+
autoSubscribe: false
72+
noProvider: true
73+
versions:
74+
- v0-sha.lvlvyfw
75+
EOF
76+
```
77+
78+
Check if ClusterClasses exist
79+
80+
```sh
81+
kubectl get clusterclass -n cluster
82+
```
83+
84+
cluster.yaml
85+
86+
```sh
87+
cat <<EOF | kubectl apply -f -
88+
apiVersion: cluster.x-k8s.io/v1beta1
89+
kind: Cluster
90+
metadata:
91+
name: my-cluster
92+
namespace: cluster
93+
labels:
94+
managed-secret: cloud-config
95+
spec:
96+
clusterNetwork:
97+
pods:
98+
cidrBlocks:
99+
- "172.16.0.0/16"
100+
serviceDomain: cluster.local
101+
services:
102+
cidrBlocks:
103+
- "10.96.0.0/12"
104+
topology:
105+
class: openstack-scs-1-32-v0-sha.lvlvyfw
106+
controlPlane:
107+
replicas: 1
108+
version: v1.32.1
109+
workers:
110+
machineDeployments:
111+
- class: default-worker
112+
name: md-0
113+
replicas: 1
114+
EOF
115+
```
116+
117+
```sh
118+
clusterctl get kubeconfig -n cluster openstack-testcluster > /tmp/kubeconfig
119+
kubectl get nodes --kubeconfig /tmp/kubeconfig
120+
```

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: 'This chart installs and configures:
33
44
* Openstack scs Cluster Class
55
6-
'
7-
name: openstack-scs-1-30-cluster-class
6+
"
7+
name: openstack-scs-1-32-cluster-class
88
type: application
99
version: v1
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
apiVersion: openstack.k-orc.cloud/v1alpha1
3+
kind: Image
4+
metadata:
5+
name: "{{ .Values.images.worker.name }}"
6+
spec:
7+
cloudCredentialsRef:
8+
cloudName: "{{ .Values.identityRef.cloudName }}"
9+
secretName: "{{ .Values.identityRef.name }}"
10+
managementPolicy: managed
11+
resource:
12+
properties:
13+
diskBus: "scsi"
14+
scsiModel: "virtio-scsi"
15+
content:
16+
diskFormat: qcow2
17+
download:
18+
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
19+
hash:
20+
algorithm: sha256
21+
value: 1d261cd043f1c16a676be9079984c912df82387be4c6766b122a966e266a080c

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ openstack_loadbalancer_apiserver: false
77
# TBD, currently needed:
88
images:
99
controlPlane:
10-
name: ubuntu-capi-image-v1.30.9
10+
name: ubuntu-capi-image-v1.32.1
1111
worker:
12-
name: ubuntu-capi-image-v1.30.9
12+
name: ubuntu-capi-image-v1.32.1
1313
identityRef:
1414
name: openstack
1515
cloudName: openstack

providers/openstack/scs/csctl.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
apiVersion: csctl.clusterstack.x-k8s.io/v1alpha1
22
config:
33
clusterStackName: scs
4-
kubernetesVersion: v1.30.9
4+
kubernetesVersion: v1.32.1
55
provider:
66
apiVersion: openstack.csctl.clusterstack.x-k8s.io/v1alpha1
7-
config:
8-
method: get
97
type: openstack

providers/openstack/scs/node-images/config.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)