Skip to content

Commit 91dff20

Browse files
committed
chore: update to v1beta1
Signed-off-by: rapour <[email protected]>
1 parent 6bd26f0 commit 91dff20

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

templates/cluster-template-openstack.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export OPENSTACK_CLOUD=openstack
88
export OPENSTACK_CLOUD_CONFIG_SECRET_NAME=cloud-config
99

1010
# OpenStack region and network configuration. External network ID is only needed if multiple external networks exist.
11+
export OPENSTACK_DISABLE_EXTERNAL_NETWORK=false
1112
export OPENSTACK_EXTERNAL_NETWORK_ID=""
1213
export OPENSTACK_FAILURE_DOMAIN="nova"
1314

templates/cluster-template-openstack.yaml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ metadata:
66
name: ${CLUSTER_NAME}
77
spec:
88
infrastructureRef:
9-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
9+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
1010
kind: OpenStackCluster
1111
name: ${CLUSTER_NAME}
1212
controlPlaneRef:
1313
kind: MicroK8sControlPlane
1414
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
1515
name: ${CLUSTER_NAME}-control-plane
1616
---
17-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
17+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
1818
kind: OpenStackCluster
1919
metadata:
2020
name: ${CLUSTER_NAME}
@@ -24,10 +24,13 @@ spec:
2424
identityRef:
2525
name: ${OPENSTACK_CLOUD_CONFIG_SECRET_NAME}
2626
cloudName: ${OPENSTACK_CLOUD}
27-
nodeCidr: ${OPENSTACK_NETWORK_CIDR}
2827
disablePortSecurity: true
29-
dnsNameservers: [${OPENSTACK_DNS_NAMESERVERS:= }]
30-
externalNetworkId: ${OPENSTACK_EXTERNAL_NETWORK_ID:=""}
28+
managedSubnets:
29+
- cidr: ${OPENSTACK_NETWORK_CIDR}
30+
dnsNameservers: [${OPENSTACK_DNS_NAMESERVERS:= }]
31+
disableExternalNetwork: ${OPENSTACK_DISABLE_EXTERNAL_NETWORK:=false}
32+
externalNetwork:
33+
id: ${OPENSTACK_EXTERNAL_NETWORK_ID:=""}
3134
---
3235
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
3336
kind: MicroK8sControlPlane
@@ -49,22 +52,24 @@ spec:
4952
portCompatibilityRemap: true
5053
machineTemplate:
5154
infrastructureTemplate:
52-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
55+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
5356
kind: OpenStackMachineTemplate
5457
name: "${CLUSTER_NAME}-control-plane"
5558
replicas: ${CONTROL_PLANE_MACHINE_COUNT:=1}
5659
version: "v${KUBERNETES_VERSION}"
5760
upgradeStrategy: "${UPGRADE_STRATEGY}"
5861
---
59-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
62+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
6063
kind: OpenStackMachineTemplate
6164
metadata:
6265
name: ${CLUSTER_NAME}-control-plane
6366
spec:
6467
template:
6568
spec:
6669
flavor: ${OPENSTACK_CONTROL_PLANE_MACHINE_FLAVOR}
67-
image: ${OPENSTACK_IMAGE_NAME}
70+
image:
71+
filter:
72+
name: ${OPENSTACK_IMAGE_NAME}
6873
sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
6974
identityRef:
7075
name: ${OPENSTACK_CLOUD_CONFIG_SECRET_NAME}
@@ -91,10 +96,10 @@ spec:
9196
kind: MicroK8sConfigTemplate
9297
infrastructureRef:
9398
name: "${CLUSTER_NAME}-md-0"
94-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
99+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
95100
kind: OpenStackMachineTemplate
96101
---
97-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
102+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
98103
kind: OpenStackMachineTemplate
99104
metadata:
100105
name: ${CLUSTER_NAME}-md-0
@@ -105,7 +110,9 @@ spec:
105110
name: ${OPENSTACK_CLOUD_CONFIG_SECRET_NAME}
106111
cloudName: ${OPENSTACK_CLOUD}
107112
flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
108-
image: ${OPENSTACK_IMAGE_NAME}
113+
image:
114+
filter:
115+
name: ${OPENSTACK_IMAGE_NAME}
109116
sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
110117
---
111118
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1

0 commit comments

Comments
 (0)