fix: Use new patch handler for AWS and Docker ClusterClasses

jimmidyson · jimmidyson · commit e3f8bbc1e1dd · 2025-02-13T11:52:49.000Z
This means no automatic rollout of clusters using the existing
ClusterClasses and will not break any downstream project tests
that might be checking for that.
diff --git a/charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/aws-cluster-class.yaml b/charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/aws-cluster-class.yaml
@@ -23,7 +23,7 @@ spec:
   patches:
   - external:
       discoverVariablesExtension: awsclusterconfigvars-dv.cluster-api-runtime-extensions-nutanix
-      generateExtension: awsclusterconfigpatch-gp.cluster-api-runtime-extensions-nutanix
+      generateExtension: awsclusterv2configpatch-gp.cluster-api-runtime-extensions-nutanix
     name: cluster-config
   - external:
       discoverVariablesExtension: awsworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix
diff --git a/charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/docker-cluster-class.yaml b/charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/docker-cluster-class.yaml
@@ -31,7 +31,7 @@ spec:
   patches:
   - external:
       discoverVariablesExtension: dockerclusterconfigvars-dv.cluster-api-runtime-extensions-nutanix
-      generateExtension: dockerclusterconfigpatch-gp.cluster-api-runtime-extensions-nutanix
+      generateExtension: dockerclusterv2configpatch-gp.cluster-api-runtime-extensions-nutanix
     name: cluster-config
   - external:
       discoverVariablesExtension: dockerworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix
diff --git a/hack/examples/overlays/clusterclasses/aws/kustomization.yaml.tmpl b/hack/examples/overlays/clusterclasses/aws/kustomization.yaml.tmpl
@@ -19,7 +19,7 @@ patches:
         value:
           - name: "cluster-config"
             external:
-              generateExtension: "awsclusterconfigpatch-gp.cluster-api-runtime-extensions-nutanix"
+              generateExtension: "awsclusterv2configpatch-gp.cluster-api-runtime-extensions-nutanix"
               discoverVariablesExtension: "awsclusterconfigvars-dv.cluster-api-runtime-extensions-nutanix"
           - name: "worker-config"
             external:
diff --git a/hack/examples/overlays/clusterclasses/docker/kustomization.yaml.tmpl b/hack/examples/overlays/clusterclasses/docker/kustomization.yaml.tmpl
@@ -19,7 +19,7 @@ patches:
         value:
           - name: "cluster-config"
             external:
-              generateExtension: "dockerclusterconfigpatch-gp.cluster-api-runtime-extensions-nutanix"
+              generateExtension: "dockerclusterv2configpatch-gp.cluster-api-runtime-extensions-nutanix"
               discoverVariablesExtension: "dockerclusterconfigvars-dv.cluster-api-runtime-extensions-nutanix"
           - name: "worker-config"
             external:
diff --git a/pkg/handlers/aws/handlers.go b/pkg/handlers/aws/handlers.go
@@ -11,6 +11,7 @@ import (
 	awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig"
 	awsmutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/mutation"
 	awsworkerconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/workerconfig"
+	deleteinv0280awsmutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/deleteinv0280/aws/mutation"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
 )
 
@@ -27,6 +28,7 @@ func (h *Handlers) AllHandlers(mgr manager.Manager) []handlers.Named {
 		awsclusterconfig.NewVariable(),
 		awsworkerconfig.NewVariable(),
 		awsmutation.MetaPatchHandler(mgr),
+		deleteinv0280awsmutation.MetaPatchHandler(mgr),
 		awsmutation.MetaWorkerPatchHandler(mgr),
 	}
 }
diff --git a/pkg/handlers/aws/mutation/metapatch_handler.go b/pkg/handlers/aws/mutation/metapatch_handler.go
@@ -35,7 +35,7 @@ func MetaPatchHandler(mgr manager.Manager) handlers.Named {
 	patchHandlers = append(patchHandlers, genericmutation.ControlPlaneMetaMutators()...)
 
 	return mutation.NewMetaGeneratePatchesHandler(
-		"awsClusterConfigPatch",
+		"awsClusterV2ConfigPatch",
 		mgr.GetClient(),
 		patchHandlers...,
 	)
diff --git a/pkg/handlers/deleteinv0280/aws/mutation/metapatch_handler.go b/pkg/handlers/deleteinv0280/aws/mutation/metapatch_handler.go
@@ -0,0 +1,43 @@
+// Copyright 2023 Nutanix. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package mutation
+
+import (
+	"sigs.k8s.io/controller-runtime/pkg/manager"
+
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/mutation/ami"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/mutation/cni/calico"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/mutation/controlplaneloadbalancer"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/mutation/iaminstanceprofile"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/mutation/instancetype"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/mutation/network"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/mutation/region"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/mutation/securitygroups"
+	deleteinv0280genericmutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/deleteinv0280/generic/mutation"
+	genericmutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation"
+)
+
+// MetaPatchHandler returns a meta patch handler for mutating CAPA clusters.
+func MetaPatchHandler(mgr manager.Manager) handlers.Named {
+	patchHandlers := []mutation.MetaMutator{
+		calico.NewPatch(),
+		region.NewPatch(),
+		network.NewPatch(),
+		controlplaneloadbalancer.NewPatch(),
+		iaminstanceprofile.NewControlPlanePatch(),
+		instancetype.NewControlPlanePatch(),
+		ami.NewControlPlanePatch(),
+		securitygroups.NewControlPlanePatch(),
+	}
+	patchHandlers = append(patchHandlers, deleteinv0280genericmutation.MetaMutators(mgr)...)
+	patchHandlers = append(patchHandlers, genericmutation.ControlPlaneMetaMutators()...)
+
+	return mutation.NewMetaGeneratePatchesHandler(
+		"awsClusterConfigPatch",
+		mgr.GetClient(),
+		patchHandlers...,
+	)
+}
diff --git a/pkg/handlers/deleteinv0280/docker/mutation/metapatch_handler.go b/pkg/handlers/deleteinv0280/docker/mutation/metapatch_handler.go
@@ -0,0 +1,29 @@
+// Copyright 2023 Nutanix. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package mutation
+
+import (
+	"sigs.k8s.io/controller-runtime/pkg/manager"
+
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
+	deleteinv0280genericmutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/deleteinv0280/generic/mutation"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/mutation/customimage"
+	genericmutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation"
+)
+
+// MetaPatchHandler returns a meta patch handler for mutating CAPD clusters.
+func MetaPatchHandler(mgr manager.Manager) handlers.Named {
+	patchHandlers := []mutation.MetaMutator{
+		customimage.NewControlPlanePatch(),
+	}
+	patchHandlers = append(patchHandlers, deleteinv0280genericmutation.MetaMutators(mgr)...)
+	patchHandlers = append(patchHandlers, genericmutation.ControlPlaneMetaMutators()...)
+
+	return mutation.NewMetaGeneratePatchesHandler(
+		"dockerClusterConfigPatch",
+		mgr.GetClient(),
+		patchHandlers...,
+	)
+}
diff --git a/pkg/handlers/deleteinv0280/generic/mutation/metapatch_handler.go b/pkg/handlers/deleteinv0280/generic/mutation/metapatch_handler.go
@@ -0,0 +1,23 @@
+// Copyright 2024 Nutanix. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package mutation
+
+import (
+	"sigs.k8s.io/controller-runtime/pkg/manager"
+
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
+	genericmutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation"
+)
+
+// MetaPatchHandler returns a meta patch handler for mutating generic Kubernetes clusters.
+func MetaPatchHandler(mgr manager.Manager) handlers.Named {
+	patchHandlers := MetaMutators(mgr)
+	patchHandlers = append(patchHandlers, genericmutation.ControlPlaneMetaMutators()...)
+	return mutation.NewMetaGeneratePatchesHandler(
+		"genericClusterConfigPatch",
+		mgr.GetClient(),
+		patchHandlers...,
+	)
+}
diff --git a/pkg/handlers/docker/handlers.go b/pkg/handlers/docker/handlers.go
@@ -8,6 +8,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers"
+	deleteinv0280dockermutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/deleteinv0280/docker/mutation"
 	dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig"
 	dockermutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/mutation"
 	dockerworkerconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/workerconfig"
@@ -27,6 +28,7 @@ func (h *Handlers) AllHandlers(mgr manager.Manager) []handlers.Named {
 		dockerclusterconfig.NewVariable(),
 		dockerworkerconfig.NewVariable(),
 		dockermutation.MetaPatchHandler(mgr),
+		deleteinv0280dockermutation.MetaPatchHandler(mgr),
 		dockermutation.MetaWorkerPatchHandler(mgr),
 	}
 }
diff --git a/pkg/handlers/docker/mutation/metapatch_handler.go b/pkg/handlers/docker/mutation/metapatch_handler.go
@@ -21,7 +21,7 @@ func MetaPatchHandler(mgr manager.Manager) handlers.Named {
 	patchHandlers = append(patchHandlers, genericmutation.ControlPlaneMetaMutators()...)
 
 	return mutation.NewMetaGeneratePatchesHandler(
-		"dockerClusterConfigPatch",
+		"dockerClusterV2ConfigPatch",
 		mgr.GetClient(),
 		patchHandlers...,
 	)
diff --git a/pkg/handlers/generic/handlers.go b/pkg/handlers/generic/handlers.go
@@ -7,6 +7,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers"
+	deleteinv0280genericmutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/deleteinv0280/generic/mutation"
 	genericclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig"
 	genericmutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation"
 )
@@ -21,6 +22,7 @@ func (h *Handlers) AllHandlers(mgr manager.Manager) []handlers.Named {
 	return []handlers.Named{
 		genericclusterconfig.NewVariable(),
 		genericmutation.MetaPatchHandler(mgr),
+		deleteinv0280genericmutation.MetaPatchHandler(mgr),
 		genericmutation.MetaWorkerPatchHandler(mgr),
 	}
 }
diff --git a/pkg/handlers/generic/mutation/metapatch_handler.go b/pkg/handlers/generic/mutation/metapatch_handler.go
@@ -15,7 +15,7 @@ func MetaPatchHandler(mgr manager.Manager) handlers.Named {
 	patchHandlers := MetaMutators(mgr)
 	patchHandlers = append(patchHandlers, ControlPlaneMetaMutators()...)
 	return mutation.NewMetaGeneratePatchesHandler(
-		"genericClusterConfigPatch",
+		"genericClusterV2ConfigPatch",
 		mgr.GetClient(),
 		patchHandlers...,
 	)

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig"`
`12`	`12`	`awsmutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/mutation"`
`13`	`13`	`awsworkerconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/workerconfig"`
	`14`	`+ deleteinv0280awsmutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/deleteinv0280/aws/mutation"`
`14`	`15`	`"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"`
`15`	`16`	`)`
`16`	`17`
`@@ -27,6 +28,7 @@ func (h *Handlers) AllHandlers(mgr manager.Manager) []handlers.Named {`
`27`	`28`	`awsclusterconfig.NewVariable(),`
`28`	`29`	`awsworkerconfig.NewVariable(),`
`29`	`30`	`awsmutation.MetaPatchHandler(mgr),`
	`31`	`+ deleteinv0280awsmutation.MetaPatchHandler(mgr),`
`30`	`32`	`awsmutation.MetaWorkerPatchHandler(mgr),`
`31`	`33`	`}`
`32`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func MetaPatchHandler(mgr manager.Manager) handlers.Named {`
`35`	`35`	`patchHandlers = append(patchHandlers, genericmutation.ControlPlaneMetaMutators()...)`
`36`	`36`
`37`	`37`	`return mutation.NewMetaGeneratePatchesHandler(`
`38`		`- "awsClusterConfigPatch",`
	`38`	`+ "awsClusterV2ConfigPatch",`
`39`	`39`	`mgr.GetClient(),`
`40`	`40`	`patchHandlers...,`
`41`	`41`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"sigs.k8s.io/controller-runtime/pkg/manager"`
`9`	`9`
`10`	`10`	`"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers"`
	`11`	`+ deleteinv0280dockermutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/deleteinv0280/docker/mutation"`
`11`	`12`	`dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig"`
`12`	`13`	`dockermutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/mutation"`
`13`	`14`	`dockerworkerconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/workerconfig"`
`@@ -27,6 +28,7 @@ func (h *Handlers) AllHandlers(mgr manager.Manager) []handlers.Named {`
`27`	`28`	`dockerclusterconfig.NewVariable(),`
`28`	`29`	`dockerworkerconfig.NewVariable(),`
`29`	`30`	`dockermutation.MetaPatchHandler(mgr),`
	`31`	`+ deleteinv0280dockermutation.MetaPatchHandler(mgr),`
`30`	`32`	`dockermutation.MetaWorkerPatchHandler(mgr),`
`31`	`33`	`}`
`32`	`34`	`}`