Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use a consistent MachineDeployment class name #612

Merged
merged 1 commit into from
May 6, 2024
Merged

fix: use a consistent MachineDeployment class name #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...s/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
name: worker-config
workers:
machineDeployments:
- class: nutanix-quick-start-worker
- class: default-worker
machineHealthCheck:
maxUnhealthy: 40%
nodeStartupTimeout: 10m
Expand Down
2 changes: 1 addition & 1 deletion examples/capi-quick-start/nutanix-cluster-calico-crs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ spec:
version: ${KUBERNETES_VERSION}
workers:
machineDeployments:
- class: nutanix-quick-start-worker
- class: default-worker
metadata:
annotations:
cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"
Expand Down
2 changes: 1 addition & 1 deletion examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ spec:
version: ${KUBERNETES_VERSION}
workers:
machineDeployments:
- class: nutanix-quick-start-worker
- class: default-worker
metadata:
annotations:
cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"
Expand Down
2 changes: 1 addition & 1 deletion examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ spec:
version: ${KUBERNETES_VERSION}
workers:
machineDeployments:
- class: nutanix-quick-start-worker
- class: default-worker
metadata:
annotations:
cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"
Expand Down
2 changes: 1 addition & 1 deletion examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ spec:
version: ${KUBERNETES_VERSION}
workers:
machineDeployments:
- class: nutanix-quick-start-worker
- class: default-worker
metadata:
annotations:
cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "${WORKER_MACHINE_COUNT}"
Expand Down
8 changes: 8 additions & 0 deletions hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,11 @@ patches:
- target:
kind: Cluster
path: ../../../patches/dockerhub-image-registry.yaml

# Change the machineDeployments Class to match the other examples.
- target:
kind: Cluster
patch: |-
- op: "replace"
path: "/spec/topology/workers/machineDeployments/0/class"
value: default-worker
8 changes: 8 additions & 0 deletions hack/examples/bases/nutanix/clusterclass/kustomization.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ patches:
- op: "remove"
path: "/spec/variables"

# Change the machineDeployments Class to match the other examples.
- target:
kind: ClusterClass
patch: |-
- op: "replace"
path: "/spec/workers/machineDeployments/0/class"
value: default-worker

# Delete the certSANs from the template
# They will be added by the handler.
- target:
Expand Down
Loading