Update openstack resources to capo v10.0.0

Signed-off-by: Paul Hildebrandt <[email protected]>
SovereignCloudStack · Apr 19, 2024 · b7e80d7 · b7e80d7
1 parent 10b1593
commit b7e80d7
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 76 deletions.
diff --git a/providers/openstack/alpha/1-27/cluster-class/templates/cluster-class.yaml b/providers/openstack/alpha/1-27/cluster-class/templates/cluster-class.yaml
@@ -11,11 +11,11 @@ spec:
     machineInfrastructure:
       ref:
         kind: OpenStackMachineTemplate
-        apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
         name: {{ .Release.Name }}-{{ .Chart.Version }}-control-plane
   infrastructure:
     ref:
-      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+      apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
       kind: OpenStackClusterTemplate
       name: {{ .Release.Name }}-{{ .Chart.Version }}-cluster
   workers:
@@ -29,7 +29,7 @@ spec:
             name: {{ .Release.Name }}-{{ .Chart.Version }}
         infrastructure:
           ref:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             name: {{ .Release.Name }}-{{ .Chart.Version }}
   variables:
@@ -164,7 +164,7 @@ spec:
       enabledIf: {{ `'{{ ne .controller_flavor "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true
@@ -178,7 +178,7 @@ spec:
       enabledIf: {{ `'{{ ne .worker_flavor "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: false
@@ -195,7 +195,7 @@ spec:
       enabledIf: {{ `"{{ if .controller_root_disk }}true{{end}}"` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true
@@ -210,7 +210,7 @@ spec:
       enabledIf: {{ `"{{ if .worker_root_disk }}true{{end}}"` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: false
@@ -228,7 +228,7 @@ spec:
       enabledIf: {{ `'{{ ne .external_id "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -242,7 +242,7 @@ spec:
       enabledIf: {{ `'{{ ne .node_cidr "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -256,7 +256,7 @@ spec:
       enabledIf: {{ `"{{ if .dns_nameservers }}true{{end}}"` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -270,7 +270,7 @@ spec:
       enabledIf: {{ `"{{ if .openstack_security_groups }}true{{end}}"` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true
@@ -283,7 +283,7 @@ spec:
             valueFrom:
               template: {{ `"[ {{ range .openstack_security_groups }} { name: {{ . }}}, {{ end }} ]"` }}
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -295,7 +295,7 @@ spec:
       description: "Enables custom load balancer for OpenStack API server"
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -309,7 +309,7 @@ spec:
       enabledIf: {{ `'{{ ne .openstack_loadbalancer_apiserver_provider "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -323,7 +323,7 @@ spec:
       enabledIf: {{ `'{{ ne .cloud_name "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -333,7 +333,7 @@ spec:
             valueFrom:
               variable: cloud_name
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true
@@ -350,7 +350,7 @@ spec:
       enabledIf: {{ `'{{ ne .secret_name "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -360,7 +360,7 @@ spec:
             valueFrom:
               variable: secret_name
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true
@@ -377,7 +377,7 @@ spec:
       enabledIf: {{ `'{{ ne .controller_server_group_id "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true
@@ -391,7 +391,7 @@ spec:
       enabledIf: {{ `'{{ ne .worker_server_group_id "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: false
@@ -408,7 +408,7 @@ spec:
       enabledIf: {{ `'{{ ne .ssh_key "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true

diff --git a/providers/openstack/alpha/1-27/cluster-class/templates/openstack-cluster-template.yaml b/providers/openstack/alpha/1-27/cluster-class/templates/openstack-cluster-template.yaml
@@ -1,4 +1,4 @@
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: OpenStackClusterTemplate
 metadata:
   name: {{ .Release.Name }}-{{ .Chart.Version }}-cluster

diff --git a/...penstack/alpha/1-27/cluster-class/templates/openstack-machine-template-control-plane.yaml b/...penstack/alpha/1-27/cluster-class/templates/openstack-machine-template-control-plane.yaml
@@ -1,4 +1,4 @@
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: OpenStackMachineTemplate
 metadata:
   name: {{ .Release.Name }}-{{ .Chart.Version }}-control-plane

diff --git a/...iders/openstack/alpha/1-27/cluster-class/templates/openstack-machine-template-worker.yaml b/...iders/openstack/alpha/1-27/cluster-class/templates/openstack-machine-template-worker.yaml
@@ -1,4 +1,4 @@
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: OpenStackMachineTemplate
 metadata:
   name: {{ .Release.Name }}-{{ .Chart.Version }}

diff --git a/providers/openstack/alpha/1-28/cluster-class/templates/cluster-class.yaml b/providers/openstack/alpha/1-28/cluster-class/templates/cluster-class.yaml
@@ -11,11 +11,11 @@ spec:
     machineInfrastructure:
       ref:
         kind: OpenStackMachineTemplate
-        apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
         name: {{ .Release.Name }}-{{ .Chart.Version }}-control-plane
   infrastructure:
     ref:
-      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+      apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
       kind: OpenStackClusterTemplate
       name: {{ .Release.Name }}-{{ .Chart.Version }}-cluster
   workers:
@@ -29,7 +29,7 @@ spec:
             name: {{ .Release.Name }}-{{ .Chart.Version }}
         infrastructure:
           ref:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             name: {{ .Release.Name }}-{{ .Chart.Version }}
   variables:
@@ -164,7 +164,7 @@ spec:
       enabledIf: {{ `'{{ ne .controller_flavor "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true
@@ -178,7 +178,7 @@ spec:
       enabledIf: {{ `'{{ ne .worker_flavor "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: false
@@ -195,7 +195,7 @@ spec:
       enabledIf: {{ `"{{ if .controller_root_disk }}true{{end}}"` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true
@@ -210,7 +210,7 @@ spec:
       enabledIf: {{ `"{{ if .worker_root_disk }}true{{end}}"` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: false
@@ -228,7 +228,7 @@ spec:
       enabledIf: {{ `'{{ ne .external_id "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -242,7 +242,7 @@ spec:
       enabledIf: {{ `'{{ ne .node_cidr "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -256,7 +256,7 @@ spec:
       enabledIf: {{ `"{{ if .dns_nameservers }}true{{end}}"` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -270,7 +270,7 @@ spec:
       enabledIf: {{ `"{{ if .openstack_security_groups }}true{{end}}"` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true
@@ -283,7 +283,7 @@ spec:
             valueFrom:
               template: {{ `"[ {{ range .openstack_security_groups }} { name: {{ . }}}, {{ end }} ]"` }}
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -295,7 +295,7 @@ spec:
       description: "Enables custom load balancer for OpenStack API server"
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -309,7 +309,7 @@ spec:
       enabledIf: {{ `'{{ ne .openstack_loadbalancer_apiserver_provider "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -323,7 +323,7 @@ spec:
       enabledIf: {{ `'{{ ne .cloud_name "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -333,7 +333,7 @@ spec:
             valueFrom:
               variable: cloud_name
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true
@@ -350,7 +350,7 @@ spec:
       enabledIf: {{ `'{{ ne .secret_name "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackClusterTemplate
             matchResources:
               infrastructureCluster: true
@@ -360,7 +360,7 @@ spec:
             valueFrom:
               variable: secret_name
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true
@@ -377,7 +377,7 @@ spec:
       enabledIf: {{ `'{{ ne .controller_server_group_id "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true
@@ -391,7 +391,7 @@ spec:
       enabledIf: {{ `'{{ ne .worker_server_group_id "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: false
@@ -408,7 +408,7 @@ spec:
       enabledIf: {{ `'{{ ne .ssh_key "" }}'` }}
       definitions:
         - selector:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: OpenStackMachineTemplate
             matchResources:
               controlPlane: true

diff --git a/providers/openstack/alpha/1-28/cluster-class/templates/openstack-cluster-template.yaml b/providers/openstack/alpha/1-28/cluster-class/templates/openstack-cluster-template.yaml
@@ -1,4 +1,4 @@
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: OpenStackClusterTemplate
 metadata:
   name: {{ .Release.Name }}-{{ .Chart.Version }}-cluster

diff --git a/...penstack/alpha/1-28/cluster-class/templates/openstack-machine-template-control-plane.yaml b/...penstack/alpha/1-28/cluster-class/templates/openstack-machine-template-control-plane.yaml
@@ -1,4 +1,4 @@
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: OpenStackMachineTemplate
 metadata:
   name: {{ .Release.Name }}-{{ .Chart.Version }}-control-plane