Skip to content

Commit 7926f4c

Browse files
eigenpaulMalte Münchjschoone
authored
Merge wooctavia and alpha to scs (#81)
* Updates wooctavia cluster-stack to accept image selection via clusterspec Signed-off-by: Malte Münch <muench@b1-systems.de> * kube-vip variables Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de> * apiserver and workload loadbalancer variables Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de> * add dns_nameservers and node_cidr variables Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de> * Fix syntax at node_cidr Signed-off-by: Malte Münch <muench@b1-systems.de> * include certSAN patch #79 Signed-off-by: Malte Münch <muench@b1-systems.de> * Removed wooctavia kube_vip specifics from openstackclustertemplate and kubeadmcontrolplanetemplate. This commit is the "baseline" that our patches in cluster-class are expecting * (Patch 1/4) apiserver_loadbalancer=none Signed-off-by: Malte Münch <muench@b1-systems.de> * (Patch 2/4) apiserver_loadbalancer=octavia-amphora Signed-off-by: Malte Münch <muench@b1-systems.de> * (Patch 3/4) apiserver_loadbalancer=octavia-ovn Signed-off-by: Malte Münch <muench@b1-systems.de> * (Patch 4/4) apiserver_loadbalancer=kube-vip Signed-off-by: Malte Münch <muench@b1-systems.de> * Minor syntax fixes Signed-off-by: Malte Münch <muench@b1-systems.de> * Minor fix/op replace to add Signed-off-by: Malte Münch <muench@b1-systems.de> * Make occm configurable with loadbalancers Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de> * deploy yawol when yawol flag is set Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de> * Current state cluster-addon-values Signed-off-by: Malte Münch <muench@b1-systems.de> * yawol templating Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de> * new scs stack Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de> * tweaks Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de> --------- Signed-off-by: Malte Münch <muench@b1-systems.de> Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de> Co-authored-by: Malte Münch <muench@b1-systems.de> Co-authored-by: Jan Schoone <6106846+jschoone@users.noreply.github.com>
1 parent 9e570f9 commit 7926f4c

22 files changed

+1058
-0
lines changed

‎providers/openstack/scs/1-27/cluster-addon-values.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
values: |
2+
{{- define "yawol_image_id" -}}
3+
{{- range .Cluster.spec.topology.variables -}}
4+
{{- if eq .name "yawol_image_id" -}}
5+
{{ .value }}
6+
{{- end -}}
7+
{{- end -}}
8+
{{- end }}
9+
{{- define "yawol_flavor_id" -}}
10+
{{- range .Cluster.spec.topology.variables -}}
11+
{{- if eq .name "yawol_flavor_id" -}}
12+
{{ .value }}
13+
{{- end -}}
14+
{{- end -}}
15+
{{- end }}
16+
metrics-server:
17+
commonLabels:
18+
domain: "{{ .Cluster.spec.controlPlaneEndpoint.host }}"
19+
clusterAddonVersion: "v2"
20+
{{ range .Cluster.spec.topology.variables }}
21+
{{- if and (eq .name "workload_loadbalancer") (eq .value "yawol") }}
22+
yawol-controller:
23+
enabled: true
24+
yawolFloatingID: "{{ $.InfraCluster.status.externalNetwork.id }}"
25+
yawolNetworkID: "{{ $.InfraCluster.status.network.id }}"
26+
yawolAPIHost: "{{ printf "https://%s:%d" $.Cluster.spec.controlPlaneEndpoint.host $.Cluster.spec.controlPlaneEndpoint.port }}"
27+
yawolFlavorID: {{ template "yawol_flavor_id" $}}
28+
yawolImageID: {{ template "yawol_image_id" $}}
29+
{{- end }}
30+
{{- end }}
31+
32+
openstack-cloud-controller-manager:
33+
cloudConfig:
34+
loadBalancer:
35+
{{- range .Cluster.spec.topology.variables }}
36+
{{- if eq .name "workload_loadbalancer" }}
37+
{{- if or (eq .value "none") (eq .value "yawol") }}
38+
enabled: false
39+
{{ else if eq .value "octavia-amphora" }}
40+
enabled: true
41+
lb-provider: amphora
42+
{{ else if eq .value "octavia-ovn" }}
43+
enabled: true
44+
lb-provider: ovn
45+
{{- end }}
46+
{{- end }}
47+
{{- end }}

‎providers/openstack/scs/1-27/cluster-addon/.helmignore‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Patterns to ignore when building packages.
2+
# This supports shell glob matching, relative path matching, and
3+
# negation (prefixed with !). Only one pattern per line.
4+
.DS_Store
5+
# Common VCS dirs
6+
.git/
7+
.gitignore
8+
.bzr/
9+
.bzrignore
10+
.hg/
11+
.hgignore
12+
.svn/
13+
# Common backup files
14+
*.swp
15+
*.bak
16+
*.tmp
17+
*.orig
18+
*~
19+
# Various IDEs
20+
.project
21+
.idea/
22+
*.tmproj
23+
.vscode/

‎providers/openstack/scs/1-27/cluster-addon/Chart.lock‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
dependencies:
2+
- name: metrics-server
3+
repository: https://kubernetes-sigs.github.io/metrics-server/
4+
version: 3.12.0
5+
- name: cilium
6+
repository: https://helm.cilium.io/
7+
version: 1.15.2
8+
- name: openstack-cloud-controller-manager
9+
repository: https://kubernetes.github.io/cloud-provider-openstack
10+
version: 2.27.6
11+
- name: openstack-cinder-csi
12+
repository: https://kubernetes.github.io/cloud-provider-openstack
13+
version: 2.27.3
14+
- name: yawol-controller
15+
repository: https://stackitcloud.github.io/yawol
16+
version: 0.21.3
17+
digest: sha256:a9577a7d1414721ba6325511747f67dbb82f04d2b84134d92531ce2a69894a41
18+
generated: "2024-03-27T12:49:53.970259991+01:00"

‎providers/openstack/scs/1-27/cluster-addon/Chart.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
apiVersion: v2
2+
dependencies:
3+
- alias: metrics-server
4+
name: metrics-server
5+
repository: https://kubernetes-sigs.github.io/metrics-server/
6+
version: 3.12.0
7+
- alias: cilium
8+
name: cilium
9+
repository: https://helm.cilium.io/
10+
version: 1.15.2
11+
- alias: openstack-cloud-controller-manager
12+
name: openstack-cloud-controller-manager
13+
repository: https://kubernetes.github.io/cloud-provider-openstack
14+
version: 2.27.6
15+
- alias: openstack-cinder-csi
16+
name: openstack-cinder-csi
17+
repository: https://kubernetes.github.io/cloud-provider-openstack
18+
version: 2.27.3
19+
- alias: yawol-controller
20+
name: yawol-controller
21+
repository: https://stackitcloud.github.io/yawol
22+
version: 0.21.3
23+
condition: yawol-controller.enabled
24+
name: openstack-wooctavia-1-27-cluster-addon
25+
type: application
26+
version: v3

‎providers/openstack/scs/1-27/cluster-addon/charts/cilium-1.15.2.tgz‎

175 KB
Binary file not shown.

‎providers/openstack/scs/1-27/cluster-addon/charts/metrics-server-3.12.0.tgz‎

9.65 KB
Binary file not shown.

‎providers/openstack/scs/1-27/cluster-addon/charts/openstack-cinder-csi-2.27.3.tgz‎

5.65 KB
Binary file not shown.

‎providers/openstack/scs/1-27/cluster-addon/charts/openstack-cloud-controller-manager-2.27.6.tgz‎

4.56 KB
Binary file not shown.

‎providers/openstack/scs/1-27/cluster-addon/charts/yawol-controller-0.21.3.tgz‎

11.5 KB
Binary file not shown.

‎providers/openstack/scs/1-27/cluster-addon/values.yaml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
metrics-server:
2+
fullnameOverride: metrics-server
3+
replicas: 1
4+
updateStrategy:
5+
type: RollingUpdate
6+
rollingUpdate:
7+
maxSurge: 0
8+
maxUnavailable: 1
9+
10+
service:
11+
labels:
12+
kubernetes.io/cluster-service: "true"
13+
kubernetes.io/name: "Metrics-server"
14+
15+
defaultArgs:
16+
- --cert-dir=/tmp
17+
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
18+
- --kubelet-use-node-status-port
19+
- --metric-resolution=15s
20+
21+
args:
22+
- --kubelet-insecure-tls
23+
openstack-cloud-controller-manager:
24+
secret:
25+
enabled: true
26+
name: cloud-config
27+
create: false
28+
nodeSelector:
29+
node-role.kubernetes.io/control-plane: ""
30+
tolerations:
31+
- key: node.cloudprovider.kubernetes.io/uninitialized
32+
value: "true"
33+
effect: NoSchedule
34+
- key: node-role.kubernetes.io/control-plane
35+
effect: NoSchedule
36+
openstack-cinder-csi:
37+
secret:
38+
enabled: true
39+
name: cloud-config
40+
create: false
41+
nodeSelector:
42+
node-role.kubernetes.io/control-plane: ""
43+
tolerations:
44+
- key: node.cloudprovider.kubernetes.io/uninitialized
45+
value: "true"
46+
effect: NoSchedule
47+
- key: node-role.kubernetes.io/control-plane
48+
effect: NoSchedule
49+
yawol-controller:
50+
yawolOSSecretName: cloud-config
51+
enabled: false

0 commit comments

Comments
 (0)