nutanix-cloud-native · dkoshkin · Oct 6, 2025 · Sep 25, 2025 · Sep 25, 2025 · Sep 25, 2025
diff --git a/cmd/main.go b/cmd/main.go
@@ -42,7 +42,7 @@ import (
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/eks"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/webhook/addons"
@@ -109,7 +109,7 @@ func main() {
 
 	globalOptions := options.NewGlobalOptions()
 
-	genericLifecycleHandlers := lifecycle.New(globalOptions)
+	lifecycleHandlers := lifecycle.New(globalOptions)
 
 	// awsMetaHandlers combines all AWS patch and variable handlers under a single handler.
 	// It allows to specify configuration under a single variable.
@@ -140,7 +140,7 @@ func main() {
 	logsv1.AddFlags(logOptions, pflag.CommandLine)
 	globalOptions.AddFlags(pflag.CommandLine)
 	runtimeWebhookServerOpts.AddFlags(pflag.CommandLine)
-	genericLifecycleHandlers.AddFlags(pflag.CommandLine)
+	lifecycleHandlers.AddFlags(pflag.CommandLine)
 	awsMetaHandlers.AddFlags(pflag.CommandLine)
 	dockerMetaHandlers.AddFlags(pflag.CommandLine)
 	nutanixMetaHandlers.AddFlags(pflag.CommandLine)
@@ -175,7 +175,7 @@ func main() {
 	}
 
 	var allHandlers []handlers.Named
-	allHandlers = append(allHandlers, genericLifecycleHandlers.AllHandlers(mgr)...)
+	allHandlers = append(allHandlers, lifecycleHandlers.AllHandlers(mgr)...)
 	allHandlers = append(allHandlers, awsMetaHandlers.AllHandlers(mgr)...)
 	allHandlers = append(allHandlers, dockerMetaHandlers.AllHandlers(mgr)...)
 	allHandlers = append(allHandlers, nutanixMetaHandlers.AllHandlers(mgr)...)

diff --git a/docs/content/customization/kubeadm/_index.md b/docs/content/customization/kubeadm/_index.md
@@ -0,0 +1,8 @@
++++
+title = "Kubeadm"
+icon = "fa-solid fa-circle-nodes"
++++
+
+The customizations in this section are applicable to providers using [kubeadm] to bootstrap the cluster.
+
+[kubeadm]: https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm/
diff --git a/...ent/customization/generic/audit-policy.md → ...ent/customization/kubeadm/audit-policy.md b/...ent/customization/generic/audit-policy.md → ...ent/customization/kubeadm/audit-policy.md
diff --git a/...ic/auto-renewal-of-control-plane-certs.md → ...dm/auto-renewal-of-control-plane-certs.md b/...ic/auto-renewal-of-control-plane-certs.md → ...dm/auto-renewal-of-control-plane-certs.md
diff --git a/...stomization/generic/containerd-metrics.md → ...stomization/kubeadm/containerd-metrics.md b/...stomization/generic/containerd-metrics.md → ...stomization/kubeadm/containerd-metrics.md
diff --git a/docs/content/customization/generic/dns.md → docs/content/customization/kubeadm/dns.md b/docs/content/customization/generic/dns.md → docs/content/customization/kubeadm/dns.md
diff --git a/...stomization/generic/encryption-at-rest.md → ...stomization/kubeadm/encryption-at-rest.md b/...stomization/generic/encryption-at-rest.md → ...stomization/kubeadm/encryption-at-rest.md
diff --git a/docs/content/customization/generic/etcd.md → docs/content/customization/kubeadm/etcd.md b/docs/content/customization/generic/etcd.md → docs/content/customization/kubeadm/etcd.md
diff --git a/...tion/generic/extra-apiserver-cert-sans.md → ...tion/kubeadm/extra-apiserver-cert-sans.md b/...tion/generic/extra-apiserver-cert-sans.md → ...tion/kubeadm/extra-apiserver-cert-sans.md
diff --git a/.../customization/generic/kube-proxy-mode.md → .../customization/kubeadm/kube-proxy-mode.md b/.../customization/generic/kube-proxy-mode.md → .../customization/kubeadm/kube-proxy-mode.md
diff --git a/...on/generic/kubernetes-image-repository.md → ...on/kubeadm/kubernetes-image-repository.md b/...on/generic/kubernetes-image-repository.md → ...on/kubeadm/kubernetes-image-repository.md
diff --git a/...ustomization/generic/node-registration.md → ...ustomization/kubeadm/node-registration.md b/...ustomization/generic/node-registration.md → ...ustomization/kubeadm/node-registration.md
diff --git a/...omization/generic/parallel-image-pulls.md → ...omization/kubeadm/parallel-image-pulls.md b/...omization/generic/parallel-image-pulls.md → ...omization/kubeadm/parallel-image-pulls.md
diff --git a/pkg/handlers/eks/mutation/handlers.go b/pkg/handlers/eks/mutation/handlers.go
@@ -5,10 +5,10 @@ package mutation
 
 import (
 	"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/generic/mutation/kubeproxymode"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/ntp"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/taints"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/users"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/kubeproxymode"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/ntp"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/taints"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/users"
 )
 
 // metaMutators returns all EKS applicable patch handlers.

diff --git a/pkg/handlers/generic/mutation/generic/doc.go b/pkg/handlers/generic/mutation/generic/doc.go
@@ -0,0 +1,6 @@
+// Copyright 2025 Nutanix. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+// Package generic contains generic mutation handlers that can be applied to both
+// kubeadm and non-kubeadm bootstrap providers.
+package generic
diff --git a/...andlers/generic/mutation/httpproxy/doc.go → ...generic/mutation/generic/httpproxy/doc.go b/...andlers/generic/mutation/httpproxy/doc.go → ...generic/mutation/generic/httpproxy/doc.go
diff --git a/...lers/generic/mutation/httpproxy/inject.go → ...eric/mutation/generic/httpproxy/inject.go b/...lers/generic/mutation/httpproxy/inject.go → ...eric/mutation/generic/httpproxy/inject.go
diff --git a/...generic/mutation/httpproxy/inject_test.go → ...mutation/generic/httpproxy/inject_test.go b/...generic/mutation/httpproxy/inject_test.go → ...mutation/generic/httpproxy/inject_test.go
diff --git a/...utation/httpproxy/systemd_proxy_config.go → ...generic/httpproxy/systemd_proxy_config.go b/...utation/httpproxy/systemd_proxy_config.go → ...generic/httpproxy/systemd_proxy_config.go
diff --git a/...on/httpproxy/systemd_proxy_config_test.go → ...ic/httpproxy/systemd_proxy_config_test.go b/...on/httpproxy/systemd_proxy_config_test.go → ...ic/httpproxy/systemd_proxy_config_test.go
diff --git a/...ion/httpproxy/templates/systemd.conf.tmpl → ...ric/httpproxy/templates/systemd.conf.tmpl b/...ion/httpproxy/templates/systemd.conf.tmpl → ...ric/httpproxy/templates/systemd.conf.tmpl
diff --git a/...eric/mutation/httpproxy/variables_test.go → ...ation/generic/httpproxy/variables_test.go b/...eric/mutation/httpproxy/variables_test.go → ...ation/generic/httpproxy/variables_test.go
diff --git a/...tials/credential_provider_config_files.go → ...tials/credential_provider_config_files.go b/...tials/credential_provider_config_files.go → ...tials/credential_provider_config_files.go
@@ -17,7 +17,7 @@ import (
 	credentialproviderv1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1"
 	cabpkv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
 
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/imageregistries/credentials/credentialprovider"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentialprovider"
 )
 
 const (

diff --git a/.../credential_provider_config_files_test.go → .../credential_provider_config_files_test.go b/.../credential_provider_config_files_test.go → .../credential_provider_config_files_test.go
diff --git a/...ials/credential_provider_install_files.go → ...ials/credential_provider_install_files.go b/...ials/credential_provider_install_files.go → ...ials/credential_provider_install_files.go
diff --git a/...tials/credential_provider_kubelet_args.go → ...tials/credential_provider_kubelet_args.go b/...tials/credential_provider_kubelet_args.go → ...tials/credential_provider_kubelet_args.go
diff --git a/...ies/credentials/credentialprovider/doc.go → ...ies/credentials/credentialprovider/doc.go b/...ies/credentials/credentialprovider/doc.go → ...ies/credentials/credentialprovider/doc.go
diff --git a/...credentials/credentialprovider/matcher.go → ...credentials/credentialprovider/matcher.go b/...credentials/credentialprovider/matcher.go → ...credentials/credentialprovider/matcher.go
diff --git a/...es/credentials/credentialprovider/urls.go → ...es/credentials/credentialprovider/urls.go b/...es/credentials/credentialprovider/urls.go → ...es/credentials/credentialprovider/urls.go
diff --git a/...edentials/credentialprovider/urls_test.go → ...edentials/credentialprovider/urls_test.go b/...edentials/credentialprovider/urls_test.go → ...edentials/credentialprovider/urls_test.go
@@ -6,7 +6,7 @@ package credentialprovider_test
 import (
 	"testing"
 
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/imageregistries/credentials/credentialprovider"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentialprovider"
 )
 
 func TestURLsMatch(t *testing.T) {

diff --git a/...istries/credentials/credentials_secret.go → ...istries/credentials/credentials_secret.go b/...istries/credentials/credentials_secret.go → ...istries/credentials/credentials_secret.go
diff --git a/...es/credentials/credentials_secret_test.go → ...es/credentials/credentials_secret_test.go b/...es/credentials/credentials_secret_test.go → ...es/credentials/credentials_secret_test.go
diff --git a/...tation/imageregistries/credentials/doc.go → ...eneric/imageregistries/credentials/doc.go b/...tation/imageregistries/credentials/doc.go → ...eneric/imageregistries/credentials/doc.go
diff --git a/...ion/imageregistries/credentials/inject.go → ...ric/imageregistries/credentials/inject.go b/...ion/imageregistries/credentials/inject.go → ...ric/imageregistries/credentials/inject.go
diff --git a/...mageregistries/credentials/inject_test.go → ...mageregistries/credentials/inject_test.go b/...mageregistries/credentials/inject_test.go → ...mageregistries/credentials/inject_test.go
diff --git a/...ic-credential-provider-config.yaml.gotmpl → ...ic-credential-provider-config.yaml.gotmpl b/...ic-credential-provider-config.yaml.gotmpl → ...ic-credential-provider-config.yaml.gotmpl
diff --git a/...ll-kubelet-credential-providers.sh.gotmpl → ...ll-kubelet-credential-providers.sh.gotmpl b/...ll-kubelet-credential-providers.sh.gotmpl → ...ll-kubelet-credential-providers.sh.gotmpl
diff --git a/...ge-credential-provider-config.yaml.gotmpl → ...ge-credential-provider-config.yaml.gotmpl b/...ge-credential-provider-config.yaml.gotmpl → ...ge-credential-provider-config.yaml.gotmpl
diff --git a/...es/static-credential-provider.json.gotmpl → ...es/static-credential-provider.json.gotmpl b/...es/static-credential-provider.json.gotmpl → ...es/static-credential-provider.json.gotmpl
diff --git a/...eregistries/credentials/variables_test.go → ...eregistries/credentials/variables_test.go b/...eregistries/credentials/variables_test.go → ...eregistries/credentials/variables_test.go
diff --git a/...beproxymode/embedded/kubeproxyconfig.yaml → ...beproxymode/embedded/kubeproxyconfig.yaml b/...beproxymode/embedded/kubeproxyconfig.yaml → ...beproxymode/embedded/kubeproxyconfig.yaml
diff --git a/.../generic/mutation/kubeproxymode/inject.go → .../mutation/generic/kubeproxymode/inject.go b/.../generic/mutation/kubeproxymode/inject.go → .../mutation/generic/kubeproxymode/inject.go
diff --git a/...ric/mutation/kubeproxymode/inject_test.go → ...tion/generic/kubeproxymode/inject_test.go b/...ric/mutation/kubeproxymode/inject_test.go → ...tion/generic/kubeproxymode/inject_test.go
diff --git a/.../mutation/kubeproxymode/variables_test.go → ...n/generic/kubeproxymode/variables_test.go b/.../mutation/kubeproxymode/variables_test.go → ...n/generic/kubeproxymode/variables_test.go
diff --git a/...eric/mutation/mirrors/containerd_files.go → ...ation/generic/mirrors/containerd_files.go b/...eric/mutation/mirrors/containerd_files.go → ...ation/generic/mirrors/containerd_files.go
diff --git a/...mutation/mirrors/containerd_files_test.go → .../generic/mirrors/containerd_files_test.go b/...mutation/mirrors/containerd_files_test.go → .../generic/mirrors/containerd_files_test.go
diff --git a/...ndlers/generic/mutation/mirrors/inject.go → ...eneric/mutation/generic/mirrors/inject.go b/...ndlers/generic/mutation/mirrors/inject.go → ...eneric/mutation/generic/mirrors/inject.go
@@ -24,7 +24,7 @@ import (
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
-	registryutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/registry/utils"
+	registryutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/registry/utils"
 	handlersutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/utils"
 )
 

diff --git a/...s/generic/mutation/mirrors/inject_test.go → ...c/mutation/generic/mirrors/inject_test.go b/...s/generic/mutation/mirrors/inject_test.go → ...c/mutation/generic/mirrors/inject_test.go
diff --git a/...s/containerd-registry-config-drop-in.toml → ...s/containerd-registry-config-drop-in.toml b/...s/containerd-registry-config-drop-in.toml → ...s/containerd-registry-config-drop-in.toml
diff --git a/...ation/mirrors/templates/hosts.toml.gotmpl → ...neric/mirrors/templates/hosts.toml.gotmpl b/...ation/mirrors/templates/hosts.toml.gotmpl → ...neric/mirrors/templates/hosts.toml.gotmpl
diff --git a/...eneric/mutation/mirrors/variables_test.go → ...utation/generic/mirrors/variables_test.go b/...eneric/mutation/mirrors/variables_test.go → ...utation/generic/mirrors/variables_test.go
diff --git a/pkg/handlers/generic/mutation/ntp/inject.go → ...rs/generic/mutation/generic/ntp/inject.go b/pkg/handlers/generic/mutation/ntp/inject.go → ...rs/generic/mutation/generic/ntp/inject.go
diff --git a/...dlers/generic/mutation/ntp/inject_test.go → ...neric/mutation/generic/ntp/inject_test.go b/...dlers/generic/mutation/ntp/inject_test.go → ...neric/mutation/generic/ntp/inject_test.go
diff --git a/...rs/generic/mutation/ntp/variables_test.go → ...ic/mutation/generic/ntp/variables_test.go b/...rs/generic/mutation/ntp/variables_test.go → ...ic/mutation/generic/ntp/variables_test.go
diff --git a/...ic/mutation/taints/inject_controlplane.go → ...ion/generic/taints/inject_controlplane.go b/...ic/mutation/taints/inject_controlplane.go → ...ion/generic/taints/inject_controlplane.go
diff --git a/...tation/taints/inject_controlplane_test.go → ...eneric/taints/inject_controlplane_test.go b/...tation/taints/inject_controlplane_test.go → ...eneric/taints/inject_controlplane_test.go
diff --git a/...eric/mutation/taints/inject_suite_test.go → ...ation/generic/taints/inject_suite_test.go b/...eric/mutation/taints/inject_suite_test.go → ...ation/generic/taints/inject_suite_test.go
diff --git a/.../generic/mutation/taints/inject_worker.go → .../mutation/generic/taints/inject_worker.go b/.../generic/mutation/taints/inject_worker.go → .../mutation/generic/taints/inject_worker.go
diff --git a/...ric/mutation/taints/inject_worker_test.go → ...tion/generic/taints/inject_worker_test.go b/...ric/mutation/taints/inject_worker_test.go → ...tion/generic/taints/inject_worker_test.go
diff --git a/...generic/mutation/taints/variables_test.go → ...mutation/generic/taints/variables_test.go b/...generic/mutation/taints/variables_test.go → ...mutation/generic/taints/variables_test.go
diff --git a/pkg/handlers/generic/mutation/users/doc.go → ...ers/generic/mutation/generic/users/doc.go b/pkg/handlers/generic/mutation/users/doc.go → ...ers/generic/mutation/generic/users/doc.go
diff --git a/...handlers/generic/mutation/users/inject.go → .../generic/mutation/generic/users/inject.go b/...handlers/generic/mutation/users/inject.go → .../generic/mutation/generic/users/inject.go
diff --git a/...ers/generic/mutation/users/inject_test.go → ...ric/mutation/generic/users/inject_test.go b/...ers/generic/mutation/users/inject_test.go → ...ric/mutation/generic/users/inject_test.go
diff --git a/.../generic/mutation/users/variables_test.go → .../mutation/generic/users/variables_test.go b/.../generic/mutation/users/variables_test.go → .../mutation/generic/users/variables_test.go
diff --git a/pkg/handlers/generic/mutation/handlers.go b/pkg/handlers/generic/mutation/handlers.go
@@ -8,26 +8,26 @@ import (
 
 	"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/cni/calico"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/auditpolicy"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/autorenewcerts"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/containerdapplypatchesandrestart"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/containerdmetrics"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/containerdunprivilegedports"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/coredns"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/encryptionatrest"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/etcd"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/externalcloudprovider"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/extraapiservercertsans"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/httpproxy"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/imageregistries/credentials"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeproxymode"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubernetesimagerepository"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/mirrors"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/noderegistration"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/ntp"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/parallelimagepulls"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/taints"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/users"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/httpproxy"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/imageregistries/credentials"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/kubeproxymode"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/mirrors"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/ntp"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/taints"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/generic/users"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/auditpolicy"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/autorenewcerts"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/containerdmetrics"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/containerdunprivilegedports"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/coredns"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/encryptionatrest"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/etcd"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/externalcloudprovider"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/extraapiservercertsans"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/kubernetesimagerepository"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/noderegistration"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/parallelimagepulls"
 )
 
 // MetaMutators returns all generic patch handlers.

diff --git a/...licy/embedded/apiserver-audit-policy.yaml → ...licy/embedded/apiserver-audit-policy.yaml b/...licy/embedded/apiserver-audit-policy.yaml → ...licy/embedded/apiserver-audit-policy.yaml
diff --git a/...rs/generic/mutation/auditpolicy/inject.go → ...ic/mutation/kubeadm/auditpolicy/inject.go b/...rs/generic/mutation/auditpolicy/inject.go → ...ic/mutation/kubeadm/auditpolicy/inject.go
diff --git a/...neric/mutation/auditpolicy/inject_test.go → ...tation/kubeadm/auditpolicy/inject_test.go b/...neric/mutation/auditpolicy/inject_test.go → ...tation/kubeadm/auditpolicy/inject_test.go
diff --git a/...generic/mutation/autorenewcerts/inject.go → ...mutation/kubeadm/autorenewcerts/inject.go b/...generic/mutation/autorenewcerts/inject.go → ...mutation/kubeadm/autorenewcerts/inject.go
diff --git a/...ic/mutation/autorenewcerts/inject_test.go → ...ion/kubeadm/autorenewcerts/inject_test.go b/...ic/mutation/autorenewcerts/inject_test.go → ...ion/kubeadm/autorenewcerts/inject_test.go
diff --git a/...mutation/autorenewcerts/variables_test.go → .../kubeadm/autorenewcerts/variables_test.go b/...mutation/autorenewcerts/variables_test.go → .../kubeadm/autorenewcerts/variables_test.go
diff --git a/...rdapplypatchesandrestart/apply_patches.go → ...rdapplypatchesandrestart/apply_patches.go b/...rdapplypatchesandrestart/apply_patches.go → ...rdapplypatchesandrestart/apply_patches.go
diff --git a/...ontainerdapplypatchesandrestart/inject.go → ...ontainerdapplypatchesandrestart/inject.go b/...ontainerdapplypatchesandrestart/inject.go → ...ontainerdapplypatchesandrestart/inject.go
diff --git a/...nerdapplypatchesandrestart/inject_test.go → ...nerdapplypatchesandrestart/inject_test.go b/...nerdapplypatchesandrestart/inject_test.go → ...nerdapplypatchesandrestart/inject_test.go
diff --git a/...ntainerdapplypatchesandrestart/restart.go → ...ntainerdapplypatchesandrestart/restart.go b/...ntainerdapplypatchesandrestart/restart.go → ...ntainerdapplypatchesandrestart/restart.go
diff --git a/...plates/containerd-apply-patches.sh.gotmpl → ...plates/containerd-apply-patches.sh.gotmpl b/...plates/containerd-apply-patches.sh.gotmpl → ...plates/containerd-apply-patches.sh.gotmpl
diff --git a/...ndrestart/templates/containerd-restart.sh → ...ndrestart/templates/containerd-restart.sh b/...ndrestart/templates/containerd-restart.sh → ...ndrestart/templates/containerd-restart.sh
diff --git a/...ntainerdmetrics/files/metrics-config.toml → ...ntainerdmetrics/files/metrics-config.toml b/...ntainerdmetrics/files/metrics-config.toml → ...ntainerdmetrics/files/metrics-config.toml
diff --git a/...eric/mutation/containerdmetrics/inject.go → ...ation/kubeadm/containerdmetrics/inject.go b/...eric/mutation/containerdmetrics/inject.go → ...ation/kubeadm/containerdmetrics/inject.go
diff --git a/...mutation/containerdmetrics/inject_test.go → .../kubeadm/containerdmetrics/inject_test.go b/...mutation/containerdmetrics/inject_test.go → .../kubeadm/containerdmetrics/inject_test.go
diff --git a/...ric/mutation/containerdmetrics/metrics.go → ...tion/kubeadm/containerdmetrics/metrics.go b/...ric/mutation/containerdmetrics/metrics.go → ...tion/kubeadm/containerdmetrics/metrics.go
diff --git a/...orts/files/unprivileged-ports-config.toml → ...orts/files/unprivileged-ports-config.toml b/...orts/files/unprivileged-ports-config.toml → ...orts/files/unprivileged-ports-config.toml
diff --git a/...ion/containerdunprivilegedports/inject.go → ...adm/containerdunprivilegedports/inject.go b/...ion/containerdunprivilegedports/inject.go → ...adm/containerdunprivilegedports/inject.go
diff --git a/...ontainerdunprivilegedports/inject_test.go → ...ontainerdunprivilegedports/inject_test.go b/...ontainerdunprivilegedports/inject_test.go → ...ontainerdunprivilegedports/inject_test.go
diff --git a/...rdunprivilegedports/unprivileged_ports.go → ...rdunprivilegedports/unprivileged_ports.go b/...rdunprivilegedports/unprivileged_ports.go → ...rdunprivilegedports/unprivileged_ports.go
diff --git a/.../mutation/controlplanevirtualip/inject.go → ...n/kubeadm/controlplanevirtualip/inject.go b/.../mutation/controlplanevirtualip/inject.go → ...n/kubeadm/controlplanevirtualip/inject.go
@@ -21,7 +21,7 @@ import (
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/controlplanevirtualip/providers"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/providers"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
 )
 

diff --git a/...tion/controlplanevirtualip/inject_test.go → ...eadm/controlplanevirtualip/inject_test.go b/...tion/controlplanevirtualip/inject_test.go → ...eadm/controlplanevirtualip/inject_test.go
diff --git a/...ontrolplanevirtualip/providers/kubevip.go → ...ontrolplanevirtualip/providers/kubevip.go b/...ontrolplanevirtualip/providers/kubevip.go → ...ontrolplanevirtualip/providers/kubevip.go
diff --git a/...lplanevirtualip/providers/kubevip_test.go → ...lplanevirtualip/providers/kubevip_test.go b/...lplanevirtualip/providers/kubevip_test.go → ...lplanevirtualip/providers/kubevip_test.go
diff --git a/...trolplanevirtualip/providers/providers.go → ...trolplanevirtualip/providers/providers.go b/...trolplanevirtualip/providers/providers.go → ...trolplanevirtualip/providers/providers.go
diff --git a/...iders/templates/configure-for-kube-vip.sh → ...iders/templates/configure-for-kube-vip.sh b/...iders/templates/configure-for-kube-vip.sh → ...iders/templates/configure-for-kube-vip.sh
diff --git a/...ndlers/generic/mutation/coredns/inject.go → ...eneric/mutation/kubeadm/coredns/inject.go b/...ndlers/generic/mutation/coredns/inject.go → ...eneric/mutation/kubeadm/coredns/inject.go
diff --git a/...s/generic/mutation/coredns/inject_test.go → ...c/mutation/kubeadm/coredns/inject_test.go b/...s/generic/mutation/coredns/inject_test.go → ...c/mutation/kubeadm/coredns/inject_test.go
diff --git a/...eneric/mutation/coredns/variables_test.go → ...utation/kubeadm/coredns/variables_test.go b/...eneric/mutation/coredns/variables_test.go → ...utation/kubeadm/coredns/variables_test.go
diff --git a/pkg/handlers/generic/mutation/kubeadm/doc.go b/pkg/handlers/generic/mutation/kubeadm/doc.go
@@ -0,0 +1,5 @@
+// Copyright 2025 Nutanix. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+// Package kubeadm contains mutation handlers that can only be applied to the kubeadm bootstrap provider.
+package kubeadm
diff --git a/...cryptionatrest/encryptionprovider_test.go → ...cryptionatrest/encryptionprovider_test.go b/...cryptionatrest/encryptionprovider_test.go → ...cryptionatrest/encryptionprovider_test.go
diff --git a/...neric/mutation/encryptionatrest/inject.go → ...tation/kubeadm/encryptionatrest/inject.go b/...neric/mutation/encryptionatrest/inject.go → ...tation/kubeadm/encryptionatrest/inject.go
diff --git a/.../mutation/encryptionatrest/inject_test.go → ...n/kubeadm/encryptionatrest/inject_test.go b/.../mutation/encryptionatrest/inject_test.go → ...n/kubeadm/encryptionatrest/inject_test.go
diff --git a/...tation/encryptionatrest/tokengenerator.go → ...ubeadm/encryptionatrest/tokengenerator.go b/...tation/encryptionatrest/tokengenerator.go → ...ubeadm/encryptionatrest/tokengenerator.go
diff --git a/pkg/handlers/generic/mutation/etcd/inject.go → ...s/generic/mutation/kubeadm/etcd/inject.go b/pkg/handlers/generic/mutation/etcd/inject.go → ...s/generic/mutation/kubeadm/etcd/inject.go
diff --git a/...lers/generic/mutation/etcd/inject_test.go → ...eric/mutation/kubeadm/etcd/inject_test.go b/...lers/generic/mutation/etcd/inject_test.go → ...eric/mutation/kubeadm/etcd/inject_test.go
diff --git a/...s/generic/mutation/etcd/variables_test.go → ...c/mutation/kubeadm/etcd/variables_test.go b/...s/generic/mutation/etcd/variables_test.go → ...c/mutation/kubeadm/etcd/variables_test.go
diff --git a/.../mutation/externalcloudprovider/inject.go → ...n/kubeadm/externalcloudprovider/inject.go b/.../mutation/externalcloudprovider/inject.go → ...n/kubeadm/externalcloudprovider/inject.go
diff --git a/...tion/externalcloudprovider/inject_test.go → ...eadm/externalcloudprovider/inject_test.go b/...tion/externalcloudprovider/inject_test.go → ...eadm/externalcloudprovider/inject_test.go
diff --git a/...mutation/extraapiservercertsans/inject.go → .../kubeadm/extraapiservercertsans/inject.go b/...mutation/extraapiservercertsans/inject.go → .../kubeadm/extraapiservercertsans/inject.go
diff --git a/...ion/extraapiservercertsans/inject_test.go → ...adm/extraapiservercertsans/inject_test.go b/...ion/extraapiservercertsans/inject_test.go → ...adm/extraapiservercertsans/inject_test.go
diff --git a/.../extraapiservercertsans/variables_test.go → .../extraapiservercertsans/variables_test.go b/.../extraapiservercertsans/variables_test.go → .../extraapiservercertsans/variables_test.go
diff --git a/...ation/kubernetesimagerepository/inject.go → ...beadm/kubernetesimagerepository/inject.go b/...ation/kubernetesimagerepository/inject.go → ...beadm/kubernetesimagerepository/inject.go
diff --git a/.../kubernetesimagerepository/inject_test.go → .../kubernetesimagerepository/inject_test.go b/.../kubernetesimagerepository/inject_test.go → .../kubernetesimagerepository/inject_test.go
diff --git a/...bernetesimagerepository/variables_test.go → ...bernetesimagerepository/variables_test.go b/...bernetesimagerepository/variables_test.go → ...bernetesimagerepository/variables_test.go
diff --git a/...n/noderegistration/inject_controlplane.go → ...m/noderegistration/inject_controlplane.go b/...n/noderegistration/inject_controlplane.go → ...m/noderegistration/inject_controlplane.go
diff --git a/...eregistration/inject_controlplane_test.go → ...eregistration/inject_controlplane_test.go b/...eregistration/inject_controlplane_test.go → ...eregistration/inject_controlplane_test.go
diff --git a/...ion/noderegistration/inject_suite_test.go → ...adm/noderegistration/inject_suite_test.go b/...ion/noderegistration/inject_suite_test.go → ...adm/noderegistration/inject_suite_test.go
diff --git a/...utation/noderegistration/inject_worker.go → ...kubeadm/noderegistration/inject_worker.go b/...utation/noderegistration/inject_worker.go → ...kubeadm/noderegistration/inject_worker.go
diff --git a/...on/noderegistration/inject_worker_test.go → ...dm/noderegistration/inject_worker_test.go b/...on/noderegistration/inject_worker_test.go → ...dm/noderegistration/inject_worker_test.go
diff --git a/...tation/noderegistration/variables_test.go → ...ubeadm/noderegistration/variables_test.go b/...tation/noderegistration/variables_test.go → ...ubeadm/noderegistration/variables_test.go
diff --git a/...agepulls/embedded/kubeletconfigpatch.yaml → ...agepulls/embedded/kubeletconfigpatch.yaml b/...agepulls/embedded/kubeletconfigpatch.yaml → ...agepulls/embedded/kubeletconfigpatch.yaml
diff --git a/...ric/mutation/parallelimagepulls/inject.go → ...tion/kubeadm/parallelimagepulls/inject.go b/...ric/mutation/parallelimagepulls/inject.go → ...tion/kubeadm/parallelimagepulls/inject.go
diff --git a/...utation/parallelimagepulls/inject_test.go → ...kubeadm/parallelimagepulls/inject_test.go b/...utation/parallelimagepulls/inject_test.go → ...kubeadm/parallelimagepulls/inject_test.go
diff --git a/...tion/parallelimagepulls/variables_test.go → ...eadm/parallelimagepulls/variables_test.go b/...tion/parallelimagepulls/variables_test.go → ...eadm/parallelimagepulls/variables_test.go
diff --git a/...ers/generic/lifecycle/addons/helmaddon.go → pkg/handlers/lifecycle/addons/helmaddon.go b/...ers/generic/lifecycle/addons/helmaddon.go → pkg/handlers/lifecycle/addons/helmaddon.go
@@ -19,7 +19,7 @@ import (
 	caaphv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
 	k8sclient "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/k8s/client"
-	lifecycleconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/config"
+	lifecycleconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/config"
 	handlersutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/utils"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/wait"
 )

diff --git a/...rs/generic/lifecycle/addons/interfaces.go → pkg/handlers/lifecycle/addons/interfaces.go b/...rs/generic/lifecycle/addons/interfaces.go → pkg/handlers/lifecycle/addons/interfaces.go
diff --git a/...handlers/generic/lifecycle/addons/test.go → pkg/handlers/lifecycle/addons/test.go b/...handlers/generic/lifecycle/addons/test.go → pkg/handlers/lifecycle/addons/test.go
diff --git a/...lers/generic/lifecycle/ccm/aws/handler.go → pkg/handlers/lifecycle/ccm/aws/handler.go b/...lers/generic/lifecycle/ccm/aws/handler.go → pkg/handlers/lifecycle/ccm/aws/handler.go
@@ -15,8 +15,8 @@ import (
 
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
 	apivariables "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/variables"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/addons"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/config"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/addons"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/config"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
 )
 

diff --git a/...generic/lifecycle/ccm/aws/handler_test.go → ...andlers/lifecycle/ccm/aws/handler_test.go b/...generic/lifecycle/ccm/aws/handler_test.go → ...andlers/lifecycle/ccm/aws/handler_test.go
diff --git a/...generic/lifecycle/ccm/aws/strategy_crs.go → ...andlers/lifecycle/ccm/aws/strategy_crs.go b/...generic/lifecycle/ccm/aws/strategy_crs.go → ...andlers/lifecycle/ccm/aws/strategy_crs.go
diff --git a/pkg/handlers/generic/lifecycle/ccm/doc.go → pkg/handlers/lifecycle/ccm/doc.go b/pkg/handlers/generic/lifecycle/ccm/doc.go → pkg/handlers/lifecycle/ccm/doc.go
diff --git a/...handlers/generic/lifecycle/ccm/handler.go → pkg/handlers/lifecycle/ccm/handler.go b/...handlers/generic/lifecycle/ccm/handler.go → pkg/handlers/lifecycle/ccm/handler.go
diff --git a/.../generic/lifecycle/ccm/nutanix/handler.go → ...handlers/lifecycle/ccm/nutanix/handler.go b/.../generic/lifecycle/ccm/nutanix/handler.go → ...handlers/lifecycle/ccm/nutanix/handler.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
 	apivariables "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/variables"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/addons"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/config"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/addons"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/config"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
 	handlersutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/utils"
 )

diff --git a/...ric/lifecycle/ccm/nutanix/handler_test.go → ...ers/lifecycle/ccm/nutanix/handler_test.go b/...ric/lifecycle/ccm/nutanix/handler_test.go → ...ers/lifecycle/ccm/nutanix/handler_test.go
diff --git a/...eneric/lifecycle/clusterautoscaler/doc.go → ...ndlers/lifecycle/clusterautoscaler/doc.go b/...eneric/lifecycle/clusterautoscaler/doc.go → ...ndlers/lifecycle/clusterautoscaler/doc.go
diff --git a/...ic/lifecycle/clusterautoscaler/handler.go → ...rs/lifecycle/clusterautoscaler/handler.go b/...ic/lifecycle/clusterautoscaler/handler.go → ...rs/lifecycle/clusterautoscaler/handler.go
@@ -18,7 +18,7 @@ import (
 	commonhandlers "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/lifecycle"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/config"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/config"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
 )
 

diff --git a/...fecycle/clusterautoscaler/strategy_crs.go → ...fecycle/clusterautoscaler/strategy_crs.go b/...fecycle/clusterautoscaler/strategy_crs.go → ...fecycle/clusterautoscaler/strategy_crs.go
diff --git a/...e/clusterautoscaler/strategy_helmaddon.go → ...e/clusterautoscaler/strategy_helmaddon.go b/...e/clusterautoscaler/strategy_helmaddon.go → ...e/clusterautoscaler/strategy_helmaddon.go
@@ -14,8 +14,8 @@ import (
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	caaphv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/addons"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/config"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/addons"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/config"
 )
 
 type helmAddonConfig struct {

diff --git a/...c/lifecycle/clusterautoscaler/template.go → ...s/lifecycle/clusterautoscaler/template.go b/...c/lifecycle/clusterautoscaler/template.go → ...s/lifecycle/clusterautoscaler/template.go
diff --git a/...ecycle/clusterautoscaler/template_test.go → ...ecycle/clusterautoscaler/template_test.go b/...ecycle/clusterautoscaler/template_test.go → ...ecycle/clusterautoscaler/template_test.go
diff --git a/...eric/lifecycle/clusterautoscaler/utils.go → ...lers/lifecycle/clusterautoscaler/utils.go b/...eric/lifecycle/clusterautoscaler/utils.go → ...lers/lifecycle/clusterautoscaler/utils.go
diff --git a/...cycle/clusterautoscaler/variables_test.go → ...cycle/clusterautoscaler/variables_test.go b/...cycle/clusterautoscaler/variables_test.go → ...cycle/clusterautoscaler/variables_test.go
diff --git a/...dlers/generic/lifecycle/cni/calico/doc.go → pkg/handlers/lifecycle/cni/calico/doc.go b/...dlers/generic/lifecycle/cni/calico/doc.go → pkg/handlers/lifecycle/cni/calico/doc.go
diff --git a/...s/generic/lifecycle/cni/calico/handler.go → pkg/handlers/lifecycle/cni/calico/handler.go b/...s/generic/lifecycle/cni/calico/handler.go → pkg/handlers/lifecycle/cni/calico/handler.go
@@ -18,7 +18,7 @@ import (
 	commonhandlers "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/lifecycle"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/config"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/config"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
 )
 

diff --git a/...eric/lifecycle/cni/calico/strategy_crs.go → ...lers/lifecycle/cni/calico/strategy_crs.go b/...eric/lifecycle/cni/calico/strategy_crs.go → ...lers/lifecycle/cni/calico/strategy_crs.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/k8s/client"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/k8s/parser"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/cni"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/cni"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/utils"
 )
 

diff --git a/...ifecycle/cni/calico/strategy_helmaddon.go → ...ifecycle/cni/calico/strategy_helmaddon.go b/...ifecycle/cni/calico/strategy_helmaddon.go → ...ifecycle/cni/calico/strategy_helmaddon.go
@@ -12,8 +12,8 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/addons"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/config"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/addons"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/config"
 )
 
 const (

diff --git a/...dlers/generic/lifecycle/cni/cilium/doc.go → pkg/handlers/lifecycle/cni/cilium/doc.go b/...dlers/generic/lifecycle/cni/cilium/doc.go → pkg/handlers/lifecycle/cni/cilium/doc.go
diff --git a/...s/generic/lifecycle/cni/cilium/handler.go → pkg/handlers/lifecycle/cni/cilium/handler.go b/...s/generic/lifecycle/cni/cilium/handler.go → pkg/handlers/lifecycle/cni/cilium/handler.go
@@ -25,8 +25,8 @@ import (
 	commonhandlers "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/lifecycle"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/addons"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/config"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/addons"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/config"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
 	handlersutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/utils"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/wait"

diff --git a/...le/cni/cilium/handler_integration_test.go → ...le/cni/cilium/handler_integration_test.go b/...le/cni/cilium/handler_integration_test.go → ...le/cni/cilium/handler_integration_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
 	apivariables "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/variables"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/addons"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/addons"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers"
 )
 

diff --git a/...eric/lifecycle/cni/cilium/strategy_crs.go → ...lers/lifecycle/cni/cilium/strategy_crs.go b/...eric/lifecycle/cni/cilium/strategy_crs.go → ...lers/lifecycle/cni/cilium/strategy_crs.go
diff --git a/.../generic/lifecycle/cni/cilium/template.go → ...handlers/lifecycle/cni/cilium/template.go b/.../generic/lifecycle/cni/cilium/template.go → ...handlers/lifecycle/cni/cilium/template.go
diff --git a/...ric/lifecycle/cni/cilium/template_test.go → ...ers/lifecycle/cni/cilium/template_test.go b/...ric/lifecycle/cni/cilium/template_test.go → ...ers/lifecycle/cni/cilium/template_test.go
diff --git a/.../lifecycle/cni/cilium/utils_suite_test.go → .../lifecycle/cni/cilium/utils_suite_test.go b/.../lifecycle/cni/cilium/utils_suite_test.go → .../lifecycle/cni/cilium/utils_suite_test.go
diff --git a/...handlers/generic/lifecycle/cni/cluster.go → pkg/handlers/lifecycle/cni/cluster.go b/...handlers/generic/lifecycle/cni/cluster.go → pkg/handlers/lifecycle/cni/cluster.go
diff --git a/...ers/generic/lifecycle/cni/cluster_test.go → pkg/handlers/lifecycle/cni/cluster_test.go b/...ers/generic/lifecycle/cni/cluster_test.go → pkg/handlers/lifecycle/cni/cluster_test.go
diff --git a/...ndlers/generic/lifecycle/cni/constants.go → pkg/handlers/lifecycle/cni/constants.go b/...ndlers/generic/lifecycle/cni/constants.go → pkg/handlers/lifecycle/cni/constants.go
diff --git a/...s/generic/lifecycle/cni/variables_test.go → pkg/handlers/lifecycle/cni/variables_test.go b/...s/generic/lifecycle/cni/variables_test.go → pkg/handlers/lifecycle/cni/variables_test.go
diff --git a/pkg/handlers/generic/lifecycle/config/cm.go → pkg/handlers/lifecycle/config/cm.go b/pkg/handlers/generic/lifecycle/config/cm.go → pkg/handlers/lifecycle/config/cm.go
diff --git a/pkg/handlers/generic/lifecycle/cosi/doc.go → pkg/handlers/lifecycle/cosi/doc.go b/pkg/handlers/generic/lifecycle/cosi/doc.go → pkg/handlers/lifecycle/cosi/doc.go
diff --git a/...andlers/generic/lifecycle/cosi/handler.go → pkg/handlers/lifecycle/cosi/handler.go b/...andlers/generic/lifecycle/cosi/handler.go → pkg/handlers/lifecycle/cosi/handler.go
@@ -18,8 +18,8 @@ import (
 	commonhandlers "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/lifecycle"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/addons"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/config"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/addons"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/config"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
 )
 

diff --git a/.../generic/lifecycle/cosi/variables_test.go → ...handlers/lifecycle/cosi/variables_test.go b/.../generic/lifecycle/cosi/variables_test.go → ...handlers/lifecycle/cosi/variables_test.go