Skip to content

Commit 57417e2

Browse files
authored
fix: Add noderegistration patch to previous handler (#1177)
This was included in v0.29.0 and as such needs to be included in v0.30.x previous handler versions, otherwise it will remove the noderegistation configuration for Clusters referencing the older handler versions, resulting in a cluster rollout.
1 parent b1507f7 commit 57417e2

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

make/dev.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ CAREN_FEATURE_GATES ?= ""
55

66
.PHONY: dev.run-on-kind
77
dev.run-on-kind: export KUBECONFIG := $(KIND_KUBECONFIG)
8-
dev.run-on-kind: kind.create clusterctl.init
8+
dev.run-on-kind: kind.create
9+
ifndef SKIP_CLUSTERCTL_INIT
10+
dev.run-on-kind: clusterctl.init
11+
endif
912
ifndef SKIP_BUILD
1013
dev.run-on-kind: release-snapshot
1114
endif

pkg/handlers/v3/generic/mutation/handlers.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/imageregistries/credentials"
2121
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubernetesimagerepository"
2222
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/mirrors"
23+
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/noderegistration"
2324
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/taints"
2425
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/users"
2526
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/v3/generic/mutation/auditpolicy"
@@ -59,11 +60,13 @@ func MetaMutators(mgr manager.Manager) []mutation.MetaMutator {
5960
func ControlPlaneMetaMutators() []mutation.MetaMutator {
6061
return []mutation.MetaMutator{
6162
taints.NewControlPlanePatch(),
63+
noderegistration.NewControlPlanePatch(),
6264
}
6365
}
6466

6567
func WorkerMetaMutators() []mutation.MetaMutator {
6668
return []mutation.MetaMutator{
6769
taints.NewWorkerPatch(),
70+
noderegistration.NewWorkerPatch(),
6871
}
6972
}

0 commit comments

Comments
 (0)