Skip to content

Commit 55f73bb

Browse files
committed
Bumped versions of CAPI and RKE2 provider resources to resp. v1beta2 and v1beta1
Signed-off-by: Mohamed Belgaied Hassine <belgaied2@hotmail.com>
1 parent f260f5b commit 55f73bb

1 file changed

Lines changed: 15 additions & 18 deletions

File tree

templates/cluster-template-rke2-generateCPI.yaml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Namespace
33
metadata:
44
name: ${NAMESPACE}
55
---
6-
apiVersion: cluster.x-k8s.io/v1beta1
6+
apiVersion: cluster.x-k8s.io/v1beta2
77
kind: Cluster
88
metadata:
99
namespace: ${NAMESPACE}
@@ -15,11 +15,11 @@ ${RANCHER_TURTLES_LABEL}
1515
cni: external
1616
spec:
1717
controlPlaneRef:
18-
apiVersion: controlplane.cluster.x-k8s.io/v1alpha1
18+
apiGroup: controlplane.cluster.x-k8s.io
1919
kind: RKE2ControlPlane
2020
name: ${CLUSTER_NAME}-control-plane
2121
infrastructureRef:
22-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
22+
apiGroup: infrastructure.cluster.x-k8s.io
2323
kind: HarvesterCluster
2424
name: ${CLUSTER_NAME}-hv
2525
---
@@ -57,15 +57,16 @@ metadata:
5757
data:
5858
kubeconfig: ${HARVESTER_KUBECONFIG_B64}
5959
---
60-
apiVersion: controlplane.cluster.x-k8s.io/v1alpha1
60+
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
6161
kind: RKE2ControlPlane
6262
metadata:
6363
namespace: ${NAMESPACE}
6464
name: ${CLUSTER_NAME}-control-plane
6565
spec:
6666
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
67-
agentConfig:
68-
version: ${KUBERNETES_VERSION}+rke2r1
67+
version: ${KUBERNETES_VERSION}+rke2r1
68+
rolloutStrategy:
69+
type: RollingUpdate
6970
serverConfig:
7071
cni: calico
7172
cloudProviderName: external
@@ -75,18 +76,16 @@ spec:
7576
name: ${CLUSTER_NAME}-cp-machine
7677
namespace: ${NAMESPACE}
7778
---
78-
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha1
79+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
7980
kind: RKE2ConfigTemplate
8081
metadata:
8182
namespace: ${NAMESPACE}
8283
name: ${CLUSTER_NAME}-worker
8384
spec:
8485
template:
85-
spec:
86-
agentConfig:
87-
version: ${KUBERNETES_VERSION}+rke2r1
86+
spec: {}
8887
---
89-
apiVersion: cluster.x-k8s.io/v1beta1
88+
apiVersion: cluster.x-k8s.io/v1beta2
9089
kind: MachineDeployment
9190
metadata:
9291
namespace: ${NAMESPACE}
@@ -101,16 +100,14 @@ spec:
101100
spec:
102101
bootstrap:
103102
configRef:
104-
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha1
103+
apiGroup: bootstrap.cluster.x-k8s.io
105104
kind: RKE2ConfigTemplate
106105
name: ${CLUSTER_NAME}-worker
107-
namespace: ${NAMESPACE}
108106
clusterName: ${CLUSTER_NAME}
109107
infrastructureRef:
110-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
108+
apiGroup: infrastructure.cluster.x-k8s.io
111109
kind: HarvesterMachineTemplate
112110
name: ${CLUSTER_NAME}-wk-machine
113-
namespace: ${NAMESPACE}
114111
version: ${KUBERNETES_VERSION}+rke2r1
115112
---
116113
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
@@ -153,7 +150,7 @@ spec:
153150
volumeSize: ${VM_DISK_SIZE}
154151
bootOrder: 0
155152
---
156-
apiVersion: addons.cluster.x-k8s.io/v1beta1
153+
apiVersion: addons.cluster.x-k8s.io/v1beta2
157154
kind: ClusterResourceSet
158155
metadata:
159156
name: crs-harvester-ccm
@@ -167,7 +164,7 @@ spec:
167164
name: cloud-controller-manager-addon
168165
strategy: Reconcile
169166
---
170-
apiVersion: addons.cluster.x-k8s.io/v1beta1
167+
apiVersion: addons.cluster.x-k8s.io/v1beta2
171168
kind: ClusterResourceSet
172169
metadata:
173170
name: crs-harvester-csi
@@ -181,7 +178,7 @@ spec:
181178
name: harvester-csi-driver-addon
182179
strategy: Reconcile
183180
---
184-
apiVersion: addons.cluster.x-k8s.io/v1beta1
181+
apiVersion: addons.cluster.x-k8s.io/v1beta2
185182
kind: ClusterResourceSet
186183
metadata:
187184
name: crs-calico-chart-config

0 commit comments

Comments
 (0)