Skip to content

Commit d9eeebe

Browse files
authored
fix: use a consistent MachineDeployment class name (#612)
**What problem does this PR solve?**: Makes it easier for clients to consume the default ClusterClass templates and have consistent MD class names across providers. **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent 295d347 commit d9eeebe

File tree

7 files changed

+21
-5
lines changed

7 files changed

+21
-5
lines changed

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ spec:
7575
name: worker-config
7676
workers:
7777
machineDeployments:
78-
- class: nutanix-quick-start-worker
78+
- class: default-worker
7979
machineHealthCheck:
8080
maxUnhealthy: 40%
8181
nodeStartupTimeout: 10m

examples/capi-quick-start/nutanix-cluster-calico-crs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ spec:
140140
version: ${KUBERNETES_VERSION}
141141
workers:
142142
machineDeployments:
143-
- class: nutanix-quick-start-worker
143+
- class: default-worker
144144
metadata:
145145
annotations:
146146
cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"

examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ spec:
140140
version: ${KUBERNETES_VERSION}
141141
workers:
142142
machineDeployments:
143-
- class: nutanix-quick-start-worker
143+
- class: default-worker
144144
metadata:
145145
annotations:
146146
cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"

examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ spec:
140140
version: ${KUBERNETES_VERSION}
141141
workers:
142142
machineDeployments:
143-
- class: nutanix-quick-start-worker
143+
- class: default-worker
144144
metadata:
145145
annotations:
146146
cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"

examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ spec:
140140
version: ${KUBERNETES_VERSION}
141141
workers:
142142
machineDeployments:
143-
- class: nutanix-quick-start-worker
143+
- class: default-worker
144144
metadata:
145145
annotations:
146146
cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"

hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,11 @@ patches:
6666
- target:
6767
kind: Cluster
6868
path: ../../../patches/dockerhub-image-registry.yaml
69+
70+
# Change the machineDeployments Class to match the other examples.
71+
- target:
72+
kind: Cluster
73+
patch: |-
74+
- op: "replace"
75+
path: "/spec/topology/workers/machineDeployments/0/class"
76+
value: default-worker

hack/examples/bases/nutanix/clusterclass/kustomization.yaml.tmpl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ patches:
3030
- op: "remove"
3131
path: "/spec/variables"
3232

33+
# Change the machineDeployments Class to match the other examples.
34+
- target:
35+
kind: ClusterClass
36+
patch: |-
37+
- op: "replace"
38+
path: "/spec/workers/machineDeployments/0/class"
39+
value: default-worker
40+
3341
# Delete the certSANs from the template
3442
# They will be added by the handler.
3543
- target:

0 commit comments

Comments
 (0)