Merge pull request #125 from canonical/KU-3872/update-openstack-templates

update openstack provider resources to v1beta1

Author: rapour

templates/cluster-template-openstack.yaml

@@ -6,29 +6,31 @@ metadata:
   name: ${CLUSTER_NAME}
 spec:
   infrastructureRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+    apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
     kind: OpenStackCluster
     name: ${CLUSTER_NAME}
   controlPlaneRef:
     kind: MicroK8sControlPlane
     apiVersion: controlplane.cluster.x-k8s.io/v1beta1
     name: ${CLUSTER_NAME}-control-plane
 ---
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: OpenStackCluster
 metadata:
   name: ${CLUSTER_NAME}
 spec:
   apiServerLoadBalancer:
     enabled: ${OPENSTACK_USE_OCTAVIA_LOADBALANCER}
-  cloudName: ${OPENSTACK_CLOUD}
   identityRef:
     name: ${OPENSTACK_CLOUD_CONFIG_SECRET_NAME}
-    kind: Secret
-  nodeCidr: ${OPENSTACK_NETWORK_CIDR}
+    cloudName: ${OPENSTACK_CLOUD}
   disablePortSecurity: true
-  dnsNameservers: [${OPENSTACK_DNS_NAMESERVERS:= }]
-  externalNetworkId: ${OPENSTACK_EXTERNAL_NETWORK_ID:=""}
+  managedSubnets:
+  - cidr: ${OPENSTACK_NETWORK_CIDR}
+    dnsNameservers: [${OPENSTACK_DNS_NAMESERVERS:= }]
+  disableExternalNetwork: false
+  externalNetwork:
+    id: ${OPENSTACK_EXTERNAL_NETWORK_ID:=""}
 ---
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
 kind: MicroK8sControlPlane
@@ -50,27 +52,28 @@ spec:
       portCompatibilityRemap: true
   machineTemplate:
     infrastructureTemplate:
-      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+      apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
       kind: OpenStackMachineTemplate
       name: "${CLUSTER_NAME}-control-plane"
   replicas: ${CONTROL_PLANE_MACHINE_COUNT:=1}
   version: "v${KUBERNETES_VERSION}"
   upgradeStrategy: "${UPGRADE_STRATEGY}"
 ---
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: OpenStackMachineTemplate
 metadata:
   name: ${CLUSTER_NAME}-control-plane
 spec:
   template:
     spec:
       flavor: ${OPENSTACK_CONTROL_PLANE_MACHINE_FLAVOR}
-      image: ${OPENSTACK_IMAGE_NAME}
+      image:
+        filter:
+          name: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
-      cloudName: ${OPENSTACK_CLOUD}
       identityRef:
         name: ${OPENSTACK_CLOUD_CONFIG_SECRET_NAME}
-        kind: Secret
+        cloudName: ${OPENSTACK_CLOUD}
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
@@ -93,22 +96,23 @@ spec:
           kind: MicroK8sConfigTemplate
       infrastructureRef:
         name: "${CLUSTER_NAME}-md-0"
-        apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
         kind: OpenStackMachineTemplate
 ---
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: OpenStackMachineTemplate
 metadata:
   name: ${CLUSTER_NAME}-md-0
 spec:
   template:
     spec:
-      cloudName: ${OPENSTACK_CLOUD}
       identityRef:
         name: ${OPENSTACK_CLOUD_CONFIG_SECRET_NAME}
-        kind: Secret
+        cloudName: ${OPENSTACK_CLOUD}
       flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
-      image: ${OPENSTACK_IMAGE_NAME}
+      image:
+        filter:
+          name: ${OPENSTACK_IMAGE_NAME}
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1