Merge branch 'main' into feat/metal3

Author: chess-knight

providers/openstack/alpha/1-27/cluster-addon/Chart.yaml

@@ -18,4 +18,4 @@ dependencies:
   version: 2.27.3
 name: openstack-alpha-1-27-cluster-addon
 type: application
-version: << .ClusterAddonVersion >>
+version: v1

providers/openstack/alpha/1-27/cluster-class/Chart.yaml

@@ -4,4 +4,4 @@ description: |
   * Openstack Alpha Cluster Class
 name: openstack-alpha-1-27-cluster-class
 type: application
-version: << .ClusterClassVersion >>
+version: v1

providers/openstack/alpha/1-29/cluster-addon/Chart.yaml

@@ -18,4 +18,4 @@ dependencies:
   version: 2.29.0
 name: openstack-alpha-1-29-cluster-addon
 type: application
-version: << .ClusterAddonVersion >>
+version: v2

providers/openstack/alpha/1-29/cluster-class/Chart.yaml

@@ -4,4 +4,4 @@ description: |
   * Openstack Alpha Cluster Class
 name: openstack-alpha-1-29-cluster-class
 type: application
-version: << .ClusterClassVersion >>
+version: v2

providers/openstack/alpha/1-29/cluster-class/templates/cluster-class.yaml

@@ -158,6 +158,16 @@ spec:
          default: ""
          example: "capi-keypair"
          description: "The ssh key to inject in the nodes."
+   - name: certSANs
+     required: false
+     schema:
+       openAPIV3Schema:
+         type: array
+         default: []
+         example: ["mydomain.example"]
+         description: "CertSANs sets extra Subject Alternative Names for the API Server signing cert."
+         items:
+           type: string
   patches:
     - name: k8s_version
       description: "Sets the openstack node image for workers and the controlplane to the cluster-api image with the version mentioned in spec.topology.version."
@@ -436,3 +446,17 @@ spec:
             path: "/spec/template/spec/sshKeyName"
             valueFrom:
               variable: ssh_key
+    - name: certSANs
+      description: "CertSANs sets extra Subject Alternative Names for the API Server signing cert."
+      enabledIf: {{ `"{{ if .certSANs }}true{{end}}"` }}
+      definitions:
+        - selector:
+            apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+            kind: KubeadmControlPlaneTemplate
+            matchResources:
+              controlPlane: true
+          jsonPatches:
+          - op: add
+            path: "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/apiServer/certSANs"
+            valueFrom:
+              variable: certSANs

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

@@ -0,0 +1,47 @@
+values: |
+  {{- define "yawol_image_id" -}}
+    {{- range .Cluster.spec.topology.variables -}}
+      {{- if eq .name "yawol_image_id" -}}
+        {{ .value }}
+      {{- end -}}
+    {{- end -}}
+  {{- end }}
+  {{- define "yawol_flavor_id" -}}
+    {{- range .Cluster.spec.topology.variables -}}
+      {{- if eq .name "yawol_flavor_id" -}}
+        {{ .value }}
+      {{- end -}}
+    {{- end -}}
+  {{- end }}
+  metrics-server:
+    commonLabels:
+      domain: "{{ .Cluster.spec.controlPlaneEndpoint.host }}"
+      clusterAddonVersion: "v2"
+  {{ range .Cluster.spec.topology.variables }}
+  {{- if and (eq .name "workload_loadbalancer") (eq .value "yawol") }}
+  yawol-controller:
+    enabled: true
+    yawolFloatingID: "{{ $.InfraCluster.status.externalNetwork.id }}"
+    yawolNetworkID: "{{ $.InfraCluster.status.network.id }}"
+    yawolAPIHost: "{{ printf "https://%s:%d" $.Cluster.spec.controlPlaneEndpoint.host $.Cluster.spec.controlPlaneEndpoint.port }}"
+    yawolFlavorID: {{ template "yawol_flavor_id" $}}
+    yawolImageID: {{ template "yawol_image_id" $}}
+  {{- end }}
+  {{- end }}
+
+  openstack-cloud-controller-manager:
+    cloudConfig:
+      loadBalancer:
+      {{- range .Cluster.spec.topology.variables }}
+      {{- if eq .name "workload_loadbalancer" }}
+      {{- if or (eq .value "none") (eq .value "yawol") }}
+        enabled: false
+      {{ else if eq .value "octavia-amphora" }}
+        enabled: true
+        lb-provider: amphora
+      {{ else if eq .value "octavia-ovn" }}
+        enabled: true
+        lb-provider: ovn
+      {{- end }}
+      {{- end }}
+      {{- end }}

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

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

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

@@ -0,0 +1,18 @@
+dependencies:
+- name: metrics-server
+  repository: https://kubernetes-sigs.github.io/metrics-server/
+  version: 3.12.0
+- name: cilium
+  repository: https://helm.cilium.io/
+  version: 1.15.2
+- name: openstack-cloud-controller-manager
+  repository: https://kubernetes.github.io/cloud-provider-openstack
+  version: 2.27.6
+- name: openstack-cinder-csi
+  repository: https://kubernetes.github.io/cloud-provider-openstack
+  version: 2.27.3
+- name: yawol-controller
+  repository: https://stackitcloud.github.io/yawol
+  version: 0.21.3
+digest: sha256:a9577a7d1414721ba6325511747f67dbb82f04d2b84134d92531ce2a69894a41
+generated: "2024-03-27T12:49:53.970259991+01:00"

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

@@ -0,0 +1,26 @@
+apiVersion: v2
+dependencies:
+  - alias: metrics-server
+    name: metrics-server
+    repository: https://kubernetes-sigs.github.io/metrics-server/
+    version: 3.12.0
+  - alias: cilium
+    name: cilium
+    repository: https://helm.cilium.io/
+    version: 1.15.2
+  - alias: openstack-cloud-controller-manager
+    name: openstack-cloud-controller-manager
+    repository: https://kubernetes.github.io/cloud-provider-openstack
+    version: 2.27.6
+  - alias: openstack-cinder-csi
+    name: openstack-cinder-csi
+    repository: https://kubernetes.github.io/cloud-provider-openstack
+    version: 2.27.3
+  - alias: yawol-controller
+    name: yawol-controller
+    repository: https://stackitcloud.github.io/yawol
+    version: 0.21.3
+    condition: yawol-controller.enabled
+name: openstack-wooctavia-1-27-cluster-addon
+type: application
+version: v3