Skip to content

Commit a2c4683

Browse files
authored
Fix RKE2 ClusterClass and RKE2 default registration method (#60)
Signed-off-by: Andrea Mazzotti <[email protected]>
1 parent 44c7035 commit a2c4683

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

infrastructure-elemental/v0.0.0/cluster-template-rke2.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ spec:
7575
kind: ElementalMachineTemplate
7676
name: ${CLUSTER_NAME}-control-plane
7777
nodeDrainTimeout: 2m
78-
registrationMethod: "address"
79-
registrationAddress: "${CONTROL_PLANE_ENDPOINT_HOST}"
78+
registrationMethod: "control-plane-endpoint"
8079
rolloutStrategy:
8180
type: "RollingUpdate"
8281
rollingUpdate:

infrastructure-elemental/v0.0.0/clusterclass-rke2.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@ spec:
7575
matchResources:
7676
controlPlane: true
7777
jsonPatches:
78-
- op: add
79-
path: "/spec/template/spec/registrationAddress"
80-
valueFrom:
81-
variable: controlPlaneEndpointHost
8278
- op: add
8379
path: "/spec/template/spec/kubeadmConfigSpec/files"
8480
valueFrom:
@@ -174,12 +170,16 @@ metadata:
174170
spec:
175171
template:
176172
spec:
173+
infrastructureRef:
174+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
175+
kind: ElementalMachineTemplate
176+
name: rke2-control-plane
177177
serverConfig:
178178
disableComponents:
179179
kubernetesComponents:
180180
- cloudController
181181
nodeDrainTimeout: 2m
182-
registrationMethod: "address"
182+
registrationMethod: "control-plane-endpoint"
183183
rolloutStrategy:
184184
type: "RollingUpdate"
185185
rollingUpdate:

0 commit comments

Comments
 (0)