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 index fed721fe..706340f7 100644 --- 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 index 4cb0caaf..d220eb8c 100644 --- 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/providers/openstack/alpha/1-27/cluster-class/templates/openstack-machine-template-control-plane.yaml b/providers/openstack/alpha/1-27/cluster-class/templates/openstack-machine-template-control-plane.yaml index 2efa0b86..f0f1af0e 100644 --- a/providers/openstack/alpha/1-27/cluster-class/templates/openstack-machine-template-control-plane.yaml +++ b/providers/openstack/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/providers/openstack/alpha/1-27/cluster-class/templates/openstack-machine-template-worker.yaml b/providers/openstack/alpha/1-27/cluster-class/templates/openstack-machine-template-worker.yaml index 4db249bc..c564684f 100644 --- a/providers/openstack/alpha/1-27/cluster-class/templates/openstack-machine-template-worker.yaml +++ b/providers/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 index fed721fe..706340f7 100644 --- 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 index 4cb0caaf..d220eb8c 100644 --- 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/providers/openstack/alpha/1-28/cluster-class/templates/openstack-machine-template-control-plane.yaml b/providers/openstack/alpha/1-28/cluster-class/templates/openstack-machine-template-control-plane.yaml index 2efa0b86..f0f1af0e 100644 --- a/providers/openstack/alpha/1-28/cluster-class/templates/openstack-machine-template-control-plane.yaml +++ b/providers/openstack/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 diff --git a/providers/openstack/alpha/1-28/cluster-class/templates/openstack-machine-template-worker.yaml b/providers/openstack/alpha/1-28/cluster-class/templates/openstack-machine-template-worker.yaml index 4db249bc..c564684f 100644 --- a/providers/openstack/alpha/1-28/cluster-class/templates/openstack-machine-template-worker.yaml +++ b/providers/openstack/alpha/1-28/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-29/cluster-class/templates/cluster-class.yaml b/providers/openstack/alpha/1-29/cluster-class/templates/cluster-class.yaml index 74daff61..39fc994e 100644 --- a/providers/openstack/alpha/1-29/cluster-class/templates/cluster-class.yaml +++ b/providers/openstack/alpha/1-29/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: @@ -163,7 +163,7 @@ spec: description: "Sets the openstack node image for workers and the controlplane to the cluster-api image with the version mentioned in spec.topology.version." definitions: - selector: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate matchResources: controlPlane: true @@ -180,7 +180,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 @@ -194,7 +194,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 @@ -211,7 +211,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 @@ -226,7 +226,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 @@ -244,7 +244,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 @@ -258,7 +258,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 @@ -272,7 +272,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 @@ -286,7 +286,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 @@ -299,7 +299,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 @@ -311,7 +311,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 @@ -325,7 +325,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 @@ -339,7 +339,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 @@ -349,7 +349,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 @@ -366,7 +366,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 @@ -376,7 +376,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 @@ -393,7 +393,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 @@ -407,7 +407,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 @@ -424,7 +424,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-29/cluster-class/templates/kubeadm-config-template-worker-openstack.yaml b/providers/openstack/alpha/1-29/cluster-class/templates/kubeadm-config-template-worker-openstack.yaml index 8f3b770a..471ba82b 100644 --- a/providers/openstack/alpha/1-29/cluster-class/templates/kubeadm-config-template-worker-openstack.yaml +++ b/providers/openstack/alpha/1-29/cluster-class/templates/kubeadm-config-template-worker-openstack.yaml @@ -10,4 +10,4 @@ spec: kubeletExtraArgs: cloud-provider: external provider-id: openstack:///'{{"{{"}} instance_id {{"}}"}}' - name: '{{"{{"}} local_hostname {{"}}"}}' + name: '{{"{{"}} local_hostname {{"}}"}}' \ No newline at end of file diff --git a/providers/openstack/alpha/1-29/cluster-class/templates/kubeadm-control-plane-template.yaml b/providers/openstack/alpha/1-29/cluster-class/templates/kubeadm-control-plane-template.yaml index ef3e127e..08b8e11a 100644 --- a/providers/openstack/alpha/1-29/cluster-class/templates/kubeadm-control-plane-template.yaml +++ b/providers/openstack/alpha/1-29/cluster-class/templates/kubeadm-control-plane-template.yaml @@ -33,4 +33,4 @@ spec: kubeletExtraArgs: cloud-provider: external provider-id: openstack:///'{{"{{"}} instance_id {{"}}"}}' - name: '{{"{{"}} local_hostname {{"}}"}}' + name: '{{"{{"}} local_hostname {{"}}"}}' \ No newline at end of file diff --git a/providers/openstack/alpha/1-29/cluster-class/templates/openstack-cluster-template.yaml b/providers/openstack/alpha/1-29/cluster-class/templates/openstack-cluster-template.yaml index 4cb0caaf..e474baff 100644 --- a/providers/openstack/alpha/1-29/cluster-class/templates/openstack-cluster-template.yaml +++ b/providers/openstack/alpha/1-29/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 @@ -21,4 +21,4 @@ spec: {{- range .Values.dns_nameservers }} - {{ . }} {{- end }} - externalNetworkId: {{ .Values.external_id }} + externalNetworkId: {{ .Values.external_id }} \ No newline at end of file diff --git a/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-control-plane.yaml b/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-control-plane.yaml index a32f80fa..4ea9c85b 100644 --- a/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-control-plane.yaml +++ b/providers/openstack/alpha/1-29/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/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-worker.yaml b/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-worker.yaml index 11edf1cd..5d488877 100644 --- a/providers/openstack/alpha/1-29/cluster-class/templates/openstack-machine-template-worker.yaml +++ b/providers/openstack/alpha/1-29/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 }}