diff --git a/cmd/main.go b/cmd/main.go index 13ee8b1ae..a613b2000 100644 --- 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 new file mode 100644 index 000000000..2dafcc8bd --- /dev/null +++ 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/docs/content/customization/generic/audit-policy.md b/docs/content/customization/kubeadm/audit-policy.md similarity index 100% rename from docs/content/customization/generic/audit-policy.md rename to docs/content/customization/kubeadm/audit-policy.md diff --git a/docs/content/customization/generic/auto-renewal-of-control-plane-certs.md b/docs/content/customization/kubeadm/auto-renewal-of-control-plane-certs.md similarity index 100% rename from docs/content/customization/generic/auto-renewal-of-control-plane-certs.md rename to docs/content/customization/kubeadm/auto-renewal-of-control-plane-certs.md diff --git a/docs/content/customization/generic/containerd-metrics.md b/docs/content/customization/kubeadm/containerd-metrics.md similarity index 100% rename from docs/content/customization/generic/containerd-metrics.md rename to docs/content/customization/kubeadm/containerd-metrics.md diff --git a/docs/content/customization/generic/dns.md b/docs/content/customization/kubeadm/dns.md similarity index 100% rename from docs/content/customization/generic/dns.md rename to docs/content/customization/kubeadm/dns.md diff --git a/docs/content/customization/generic/encryption-at-rest.md b/docs/content/customization/kubeadm/encryption-at-rest.md similarity index 100% rename from docs/content/customization/generic/encryption-at-rest.md rename to docs/content/customization/kubeadm/encryption-at-rest.md diff --git a/docs/content/customization/generic/etcd.md b/docs/content/customization/kubeadm/etcd.md similarity index 100% rename from docs/content/customization/generic/etcd.md rename to docs/content/customization/kubeadm/etcd.md diff --git a/docs/content/customization/generic/extra-apiserver-cert-sans.md b/docs/content/customization/kubeadm/extra-apiserver-cert-sans.md similarity index 100% rename from docs/content/customization/generic/extra-apiserver-cert-sans.md rename to docs/content/customization/kubeadm/extra-apiserver-cert-sans.md diff --git a/docs/content/customization/generic/kube-proxy-mode.md b/docs/content/customization/kubeadm/kube-proxy-mode.md similarity index 100% rename from docs/content/customization/generic/kube-proxy-mode.md rename to docs/content/customization/kubeadm/kube-proxy-mode.md diff --git a/docs/content/customization/generic/kubernetes-image-repository.md b/docs/content/customization/kubeadm/kubernetes-image-repository.md similarity index 100% rename from docs/content/customization/generic/kubernetes-image-repository.md rename to docs/content/customization/kubeadm/kubernetes-image-repository.md diff --git a/docs/content/customization/generic/node-registration.md b/docs/content/customization/kubeadm/node-registration.md similarity index 100% rename from docs/content/customization/generic/node-registration.md rename to docs/content/customization/kubeadm/node-registration.md diff --git a/docs/content/customization/generic/parallel-image-pulls.md b/docs/content/customization/kubeadm/parallel-image-pulls.md similarity index 100% rename from docs/content/customization/generic/parallel-image-pulls.md rename to docs/content/customization/kubeadm/parallel-image-pulls.md diff --git a/pkg/handlers/eks/mutation/handlers.go b/pkg/handlers/eks/mutation/handlers.go index ae67e0196..b8de712d6 100644 --- 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 new file mode 100644 index 000000000..79158f7fd --- /dev/null +++ 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/pkg/handlers/generic/mutation/httpproxy/doc.go b/pkg/handlers/generic/mutation/generic/httpproxy/doc.go similarity index 100% rename from pkg/handlers/generic/mutation/httpproxy/doc.go rename to pkg/handlers/generic/mutation/generic/httpproxy/doc.go diff --git a/pkg/handlers/generic/mutation/httpproxy/inject.go b/pkg/handlers/generic/mutation/generic/httpproxy/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/httpproxy/inject.go rename to pkg/handlers/generic/mutation/generic/httpproxy/inject.go diff --git a/pkg/handlers/generic/mutation/httpproxy/inject_test.go b/pkg/handlers/generic/mutation/generic/httpproxy/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/httpproxy/inject_test.go rename to pkg/handlers/generic/mutation/generic/httpproxy/inject_test.go diff --git a/pkg/handlers/generic/mutation/httpproxy/systemd_proxy_config.go b/pkg/handlers/generic/mutation/generic/httpproxy/systemd_proxy_config.go similarity index 100% rename from pkg/handlers/generic/mutation/httpproxy/systemd_proxy_config.go rename to pkg/handlers/generic/mutation/generic/httpproxy/systemd_proxy_config.go diff --git a/pkg/handlers/generic/mutation/httpproxy/systemd_proxy_config_test.go b/pkg/handlers/generic/mutation/generic/httpproxy/systemd_proxy_config_test.go similarity index 100% rename from pkg/handlers/generic/mutation/httpproxy/systemd_proxy_config_test.go rename to pkg/handlers/generic/mutation/generic/httpproxy/systemd_proxy_config_test.go diff --git a/pkg/handlers/generic/mutation/httpproxy/templates/systemd.conf.tmpl b/pkg/handlers/generic/mutation/generic/httpproxy/templates/systemd.conf.tmpl similarity index 100% rename from pkg/handlers/generic/mutation/httpproxy/templates/systemd.conf.tmpl rename to pkg/handlers/generic/mutation/generic/httpproxy/templates/systemd.conf.tmpl diff --git a/pkg/handlers/generic/mutation/httpproxy/variables_test.go b/pkg/handlers/generic/mutation/generic/httpproxy/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/httpproxy/variables_test.go rename to pkg/handlers/generic/mutation/generic/httpproxy/variables_test.go diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/credential_provider_config_files.go similarity index 98% rename from pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/credential_provider_config_files.go index 8d6f8b865..8b851c4de 100644 --- a/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files.go +++ b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/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/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files_test.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/credential_provider_config_files_test.go similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files_test.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/credential_provider_config_files_test.go diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_install_files.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/credential_provider_install_files.go similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_install_files.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/credential_provider_install_files.go diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_kubelet_args.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/credential_provider_kubelet_args.go similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_kubelet_args.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/credential_provider_kubelet_args.go diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/credentialprovider/doc.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentialprovider/doc.go similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/credentialprovider/doc.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentialprovider/doc.go diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/credentialprovider/matcher.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentialprovider/matcher.go similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/credentialprovider/matcher.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentialprovider/matcher.go diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/credentialprovider/urls.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentialprovider/urls.go similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/credentialprovider/urls.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentialprovider/urls.go diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/credentialprovider/urls_test.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentialprovider/urls_test.go similarity index 96% rename from pkg/handlers/generic/mutation/imageregistries/credentials/credentialprovider/urls_test.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentialprovider/urls_test.go index 25b0704a2..7e10d4427 100644 --- a/pkg/handlers/generic/mutation/imageregistries/credentials/credentialprovider/urls_test.go +++ b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/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/pkg/handlers/generic/mutation/imageregistries/credentials/credentials_secret.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentials_secret.go similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/credentials_secret.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentials_secret.go diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/credentials_secret_test.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentials_secret_test.go similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/credentials_secret_test.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/credentials_secret_test.go diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/doc.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/doc.go similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/doc.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/doc.go diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/inject.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/inject.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/inject.go diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/inject_test.go diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/templates/dynamic-credential-provider-config.yaml.gotmpl b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/templates/dynamic-credential-provider-config.yaml.gotmpl similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/templates/dynamic-credential-provider-config.yaml.gotmpl rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/templates/dynamic-credential-provider-config.yaml.gotmpl diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/templates/install-kubelet-credential-providers.sh.gotmpl b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/templates/install-kubelet-credential-providers.sh.gotmpl similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/templates/install-kubelet-credential-providers.sh.gotmpl rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/templates/install-kubelet-credential-providers.sh.gotmpl diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/templates/kubelet-image-credential-provider-config.yaml.gotmpl b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/templates/kubelet-image-credential-provider-config.yaml.gotmpl similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/templates/kubelet-image-credential-provider-config.yaml.gotmpl rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/templates/kubelet-image-credential-provider-config.yaml.gotmpl diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/templates/static-credential-provider.json.gotmpl b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/templates/static-credential-provider.json.gotmpl similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/templates/static-credential-provider.json.gotmpl rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/templates/static-credential-provider.json.gotmpl diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/variables_test.go b/pkg/handlers/generic/mutation/generic/imageregistries/credentials/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/imageregistries/credentials/variables_test.go rename to pkg/handlers/generic/mutation/generic/imageregistries/credentials/variables_test.go diff --git a/pkg/handlers/generic/mutation/kubeproxymode/embedded/kubeproxyconfig.yaml b/pkg/handlers/generic/mutation/generic/kubeproxymode/embedded/kubeproxyconfig.yaml similarity index 100% rename from pkg/handlers/generic/mutation/kubeproxymode/embedded/kubeproxyconfig.yaml rename to pkg/handlers/generic/mutation/generic/kubeproxymode/embedded/kubeproxyconfig.yaml diff --git a/pkg/handlers/generic/mutation/kubeproxymode/inject.go b/pkg/handlers/generic/mutation/generic/kubeproxymode/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/kubeproxymode/inject.go rename to pkg/handlers/generic/mutation/generic/kubeproxymode/inject.go diff --git a/pkg/handlers/generic/mutation/kubeproxymode/inject_test.go b/pkg/handlers/generic/mutation/generic/kubeproxymode/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/kubeproxymode/inject_test.go rename to pkg/handlers/generic/mutation/generic/kubeproxymode/inject_test.go diff --git a/pkg/handlers/generic/mutation/kubeproxymode/variables_test.go b/pkg/handlers/generic/mutation/generic/kubeproxymode/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/kubeproxymode/variables_test.go rename to pkg/handlers/generic/mutation/generic/kubeproxymode/variables_test.go diff --git a/pkg/handlers/generic/mutation/mirrors/containerd_files.go b/pkg/handlers/generic/mutation/generic/mirrors/containerd_files.go similarity index 100% rename from pkg/handlers/generic/mutation/mirrors/containerd_files.go rename to pkg/handlers/generic/mutation/generic/mirrors/containerd_files.go diff --git a/pkg/handlers/generic/mutation/mirrors/containerd_files_test.go b/pkg/handlers/generic/mutation/generic/mirrors/containerd_files_test.go similarity index 100% rename from pkg/handlers/generic/mutation/mirrors/containerd_files_test.go rename to pkg/handlers/generic/mutation/generic/mirrors/containerd_files_test.go diff --git a/pkg/handlers/generic/mutation/mirrors/inject.go b/pkg/handlers/generic/mutation/generic/mirrors/inject.go similarity index 99% rename from pkg/handlers/generic/mutation/mirrors/inject.go rename to pkg/handlers/generic/mutation/generic/mirrors/inject.go index fe1231711..2e4a0334f 100644 --- a/pkg/handlers/generic/mutation/mirrors/inject.go +++ b/pkg/handlers/generic/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/pkg/handlers/generic/mutation/mirrors/inject_test.go b/pkg/handlers/generic/mutation/generic/mirrors/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/mirrors/inject_test.go rename to pkg/handlers/generic/mutation/generic/mirrors/inject_test.go diff --git a/pkg/handlers/generic/mutation/mirrors/templates/containerd-registry-config-drop-in.toml b/pkg/handlers/generic/mutation/generic/mirrors/templates/containerd-registry-config-drop-in.toml similarity index 100% rename from pkg/handlers/generic/mutation/mirrors/templates/containerd-registry-config-drop-in.toml rename to pkg/handlers/generic/mutation/generic/mirrors/templates/containerd-registry-config-drop-in.toml diff --git a/pkg/handlers/generic/mutation/mirrors/templates/hosts.toml.gotmpl b/pkg/handlers/generic/mutation/generic/mirrors/templates/hosts.toml.gotmpl similarity index 100% rename from pkg/handlers/generic/mutation/mirrors/templates/hosts.toml.gotmpl rename to pkg/handlers/generic/mutation/generic/mirrors/templates/hosts.toml.gotmpl diff --git a/pkg/handlers/generic/mutation/mirrors/variables_test.go b/pkg/handlers/generic/mutation/generic/mirrors/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/mirrors/variables_test.go rename to pkg/handlers/generic/mutation/generic/mirrors/variables_test.go diff --git a/pkg/handlers/generic/mutation/ntp/inject.go b/pkg/handlers/generic/mutation/generic/ntp/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/ntp/inject.go rename to pkg/handlers/generic/mutation/generic/ntp/inject.go diff --git a/pkg/handlers/generic/mutation/ntp/inject_test.go b/pkg/handlers/generic/mutation/generic/ntp/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/ntp/inject_test.go rename to pkg/handlers/generic/mutation/generic/ntp/inject_test.go diff --git a/pkg/handlers/generic/mutation/ntp/variables_test.go b/pkg/handlers/generic/mutation/generic/ntp/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/ntp/variables_test.go rename to pkg/handlers/generic/mutation/generic/ntp/variables_test.go diff --git a/pkg/handlers/generic/mutation/taints/inject_controlplane.go b/pkg/handlers/generic/mutation/generic/taints/inject_controlplane.go similarity index 100% rename from pkg/handlers/generic/mutation/taints/inject_controlplane.go rename to pkg/handlers/generic/mutation/generic/taints/inject_controlplane.go diff --git a/pkg/handlers/generic/mutation/taints/inject_controlplane_test.go b/pkg/handlers/generic/mutation/generic/taints/inject_controlplane_test.go similarity index 100% rename from pkg/handlers/generic/mutation/taints/inject_controlplane_test.go rename to pkg/handlers/generic/mutation/generic/taints/inject_controlplane_test.go diff --git a/pkg/handlers/generic/mutation/taints/inject_suite_test.go b/pkg/handlers/generic/mutation/generic/taints/inject_suite_test.go similarity index 100% rename from pkg/handlers/generic/mutation/taints/inject_suite_test.go rename to pkg/handlers/generic/mutation/generic/taints/inject_suite_test.go diff --git a/pkg/handlers/generic/mutation/taints/inject_worker.go b/pkg/handlers/generic/mutation/generic/taints/inject_worker.go similarity index 100% rename from pkg/handlers/generic/mutation/taints/inject_worker.go rename to pkg/handlers/generic/mutation/generic/taints/inject_worker.go diff --git a/pkg/handlers/generic/mutation/taints/inject_worker_test.go b/pkg/handlers/generic/mutation/generic/taints/inject_worker_test.go similarity index 100% rename from pkg/handlers/generic/mutation/taints/inject_worker_test.go rename to pkg/handlers/generic/mutation/generic/taints/inject_worker_test.go diff --git a/pkg/handlers/generic/mutation/taints/variables_test.go b/pkg/handlers/generic/mutation/generic/taints/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/taints/variables_test.go rename to pkg/handlers/generic/mutation/generic/taints/variables_test.go diff --git a/pkg/handlers/generic/mutation/users/doc.go b/pkg/handlers/generic/mutation/generic/users/doc.go similarity index 100% rename from pkg/handlers/generic/mutation/users/doc.go rename to pkg/handlers/generic/mutation/generic/users/doc.go diff --git a/pkg/handlers/generic/mutation/users/inject.go b/pkg/handlers/generic/mutation/generic/users/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/users/inject.go rename to pkg/handlers/generic/mutation/generic/users/inject.go diff --git a/pkg/handlers/generic/mutation/users/inject_test.go b/pkg/handlers/generic/mutation/generic/users/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/users/inject_test.go rename to pkg/handlers/generic/mutation/generic/users/inject_test.go diff --git a/pkg/handlers/generic/mutation/users/variables_test.go b/pkg/handlers/generic/mutation/generic/users/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/users/variables_test.go rename to pkg/handlers/generic/mutation/generic/users/variables_test.go diff --git a/pkg/handlers/generic/mutation/handlers.go b/pkg/handlers/generic/mutation/handlers.go index 12c749ef5..71437586d 100644 --- 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/pkg/handlers/generic/mutation/auditpolicy/embedded/apiserver-audit-policy.yaml b/pkg/handlers/generic/mutation/kubeadm/auditpolicy/embedded/apiserver-audit-policy.yaml similarity index 100% rename from pkg/handlers/generic/mutation/auditpolicy/embedded/apiserver-audit-policy.yaml rename to pkg/handlers/generic/mutation/kubeadm/auditpolicy/embedded/apiserver-audit-policy.yaml diff --git a/pkg/handlers/generic/mutation/auditpolicy/inject.go b/pkg/handlers/generic/mutation/kubeadm/auditpolicy/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/auditpolicy/inject.go rename to pkg/handlers/generic/mutation/kubeadm/auditpolicy/inject.go diff --git a/pkg/handlers/generic/mutation/auditpolicy/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/auditpolicy/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/auditpolicy/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/auditpolicy/inject_test.go diff --git a/pkg/handlers/generic/mutation/autorenewcerts/inject.go b/pkg/handlers/generic/mutation/kubeadm/autorenewcerts/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/autorenewcerts/inject.go rename to pkg/handlers/generic/mutation/kubeadm/autorenewcerts/inject.go diff --git a/pkg/handlers/generic/mutation/autorenewcerts/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/autorenewcerts/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/autorenewcerts/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/autorenewcerts/inject_test.go diff --git a/pkg/handlers/generic/mutation/autorenewcerts/variables_test.go b/pkg/handlers/generic/mutation/kubeadm/autorenewcerts/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/autorenewcerts/variables_test.go rename to pkg/handlers/generic/mutation/kubeadm/autorenewcerts/variables_test.go diff --git a/pkg/handlers/generic/mutation/containerdapplypatchesandrestart/apply_patches.go b/pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart/apply_patches.go similarity index 100% rename from pkg/handlers/generic/mutation/containerdapplypatchesandrestart/apply_patches.go rename to pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart/apply_patches.go diff --git a/pkg/handlers/generic/mutation/containerdapplypatchesandrestart/inject.go b/pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/containerdapplypatchesandrestart/inject.go rename to pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart/inject.go diff --git a/pkg/handlers/generic/mutation/containerdapplypatchesandrestart/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/containerdapplypatchesandrestart/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart/inject_test.go diff --git a/pkg/handlers/generic/mutation/containerdapplypatchesandrestart/restart.go b/pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart/restart.go similarity index 100% rename from pkg/handlers/generic/mutation/containerdapplypatchesandrestart/restart.go rename to pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart/restart.go diff --git a/pkg/handlers/generic/mutation/containerdapplypatchesandrestart/templates/containerd-apply-patches.sh.gotmpl b/pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart/templates/containerd-apply-patches.sh.gotmpl similarity index 100% rename from pkg/handlers/generic/mutation/containerdapplypatchesandrestart/templates/containerd-apply-patches.sh.gotmpl rename to pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart/templates/containerd-apply-patches.sh.gotmpl diff --git a/pkg/handlers/generic/mutation/containerdapplypatchesandrestart/templates/containerd-restart.sh b/pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart/templates/containerd-restart.sh similarity index 100% rename from pkg/handlers/generic/mutation/containerdapplypatchesandrestart/templates/containerd-restart.sh rename to pkg/handlers/generic/mutation/kubeadm/containerdapplypatchesandrestart/templates/containerd-restart.sh diff --git a/pkg/handlers/generic/mutation/containerdmetrics/files/metrics-config.toml b/pkg/handlers/generic/mutation/kubeadm/containerdmetrics/files/metrics-config.toml similarity index 100% rename from pkg/handlers/generic/mutation/containerdmetrics/files/metrics-config.toml rename to pkg/handlers/generic/mutation/kubeadm/containerdmetrics/files/metrics-config.toml diff --git a/pkg/handlers/generic/mutation/containerdmetrics/inject.go b/pkg/handlers/generic/mutation/kubeadm/containerdmetrics/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/containerdmetrics/inject.go rename to pkg/handlers/generic/mutation/kubeadm/containerdmetrics/inject.go diff --git a/pkg/handlers/generic/mutation/containerdmetrics/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/containerdmetrics/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/containerdmetrics/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/containerdmetrics/inject_test.go diff --git a/pkg/handlers/generic/mutation/containerdmetrics/metrics.go b/pkg/handlers/generic/mutation/kubeadm/containerdmetrics/metrics.go similarity index 100% rename from pkg/handlers/generic/mutation/containerdmetrics/metrics.go rename to pkg/handlers/generic/mutation/kubeadm/containerdmetrics/metrics.go diff --git a/pkg/handlers/generic/mutation/containerdunprivilegedports/files/unprivileged-ports-config.toml b/pkg/handlers/generic/mutation/kubeadm/containerdunprivilegedports/files/unprivileged-ports-config.toml similarity index 100% rename from pkg/handlers/generic/mutation/containerdunprivilegedports/files/unprivileged-ports-config.toml rename to pkg/handlers/generic/mutation/kubeadm/containerdunprivilegedports/files/unprivileged-ports-config.toml diff --git a/pkg/handlers/generic/mutation/containerdunprivilegedports/inject.go b/pkg/handlers/generic/mutation/kubeadm/containerdunprivilegedports/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/containerdunprivilegedports/inject.go rename to pkg/handlers/generic/mutation/kubeadm/containerdunprivilegedports/inject.go diff --git a/pkg/handlers/generic/mutation/containerdunprivilegedports/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/containerdunprivilegedports/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/containerdunprivilegedports/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/containerdunprivilegedports/inject_test.go diff --git a/pkg/handlers/generic/mutation/containerdunprivilegedports/unprivileged_ports.go b/pkg/handlers/generic/mutation/kubeadm/containerdunprivilegedports/unprivileged_ports.go similarity index 100% rename from pkg/handlers/generic/mutation/containerdunprivilegedports/unprivileged_ports.go rename to pkg/handlers/generic/mutation/kubeadm/containerdunprivilegedports/unprivileged_ports.go diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/inject.go b/pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/inject.go similarity index 98% rename from pkg/handlers/generic/mutation/controlplanevirtualip/inject.go rename to pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/inject.go index 5a6a62d89..02d5d4579 100644 --- a/pkg/handlers/generic/mutation/controlplanevirtualip/inject.go +++ b/pkg/handlers/generic/mutation/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/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/inject_test.go diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip.go b/pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/providers/kubevip.go similarity index 100% rename from pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip.go rename to pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/providers/kubevip.go diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip_test.go b/pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/providers/kubevip_test.go similarity index 100% rename from pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip_test.go rename to pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/providers/kubevip_test.go diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/providers/providers.go b/pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/providers/providers.go similarity index 100% rename from pkg/handlers/generic/mutation/controlplanevirtualip/providers/providers.go rename to pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/providers/providers.go diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/providers/templates/configure-for-kube-vip.sh b/pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/providers/templates/configure-for-kube-vip.sh similarity index 100% rename from pkg/handlers/generic/mutation/controlplanevirtualip/providers/templates/configure-for-kube-vip.sh rename to pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip/providers/templates/configure-for-kube-vip.sh diff --git a/pkg/handlers/generic/mutation/coredns/inject.go b/pkg/handlers/generic/mutation/kubeadm/coredns/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/coredns/inject.go rename to pkg/handlers/generic/mutation/kubeadm/coredns/inject.go diff --git a/pkg/handlers/generic/mutation/coredns/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/coredns/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/coredns/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/coredns/inject_test.go diff --git a/pkg/handlers/generic/mutation/coredns/variables_test.go b/pkg/handlers/generic/mutation/kubeadm/coredns/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/coredns/variables_test.go rename to pkg/handlers/generic/mutation/kubeadm/coredns/variables_test.go diff --git a/pkg/handlers/generic/mutation/kubeadm/doc.go b/pkg/handlers/generic/mutation/kubeadm/doc.go new file mode 100644 index 000000000..58388544e --- /dev/null +++ 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/pkg/handlers/generic/mutation/encryptionatrest/encryptionprovider_test.go b/pkg/handlers/generic/mutation/kubeadm/encryptionatrest/encryptionprovider_test.go similarity index 100% rename from pkg/handlers/generic/mutation/encryptionatrest/encryptionprovider_test.go rename to pkg/handlers/generic/mutation/kubeadm/encryptionatrest/encryptionprovider_test.go diff --git a/pkg/handlers/generic/mutation/encryptionatrest/inject.go b/pkg/handlers/generic/mutation/kubeadm/encryptionatrest/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/encryptionatrest/inject.go rename to pkg/handlers/generic/mutation/kubeadm/encryptionatrest/inject.go diff --git a/pkg/handlers/generic/mutation/encryptionatrest/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/encryptionatrest/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/encryptionatrest/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/encryptionatrest/inject_test.go diff --git a/pkg/handlers/generic/mutation/encryptionatrest/tokengenerator.go b/pkg/handlers/generic/mutation/kubeadm/encryptionatrest/tokengenerator.go similarity index 100% rename from pkg/handlers/generic/mutation/encryptionatrest/tokengenerator.go rename to pkg/handlers/generic/mutation/kubeadm/encryptionatrest/tokengenerator.go diff --git a/pkg/handlers/generic/mutation/etcd/inject.go b/pkg/handlers/generic/mutation/kubeadm/etcd/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/etcd/inject.go rename to pkg/handlers/generic/mutation/kubeadm/etcd/inject.go diff --git a/pkg/handlers/generic/mutation/etcd/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/etcd/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/etcd/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/etcd/inject_test.go diff --git a/pkg/handlers/generic/mutation/etcd/variables_test.go b/pkg/handlers/generic/mutation/kubeadm/etcd/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/etcd/variables_test.go rename to pkg/handlers/generic/mutation/kubeadm/etcd/variables_test.go diff --git a/pkg/handlers/generic/mutation/externalcloudprovider/inject.go b/pkg/handlers/generic/mutation/kubeadm/externalcloudprovider/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/externalcloudprovider/inject.go rename to pkg/handlers/generic/mutation/kubeadm/externalcloudprovider/inject.go diff --git a/pkg/handlers/generic/mutation/externalcloudprovider/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/externalcloudprovider/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/externalcloudprovider/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/externalcloudprovider/inject_test.go diff --git a/pkg/handlers/generic/mutation/extraapiservercertsans/inject.go b/pkg/handlers/generic/mutation/kubeadm/extraapiservercertsans/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/extraapiservercertsans/inject.go rename to pkg/handlers/generic/mutation/kubeadm/extraapiservercertsans/inject.go diff --git a/pkg/handlers/generic/mutation/extraapiservercertsans/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/extraapiservercertsans/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/extraapiservercertsans/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/extraapiservercertsans/inject_test.go diff --git a/pkg/handlers/generic/mutation/extraapiservercertsans/variables_test.go b/pkg/handlers/generic/mutation/kubeadm/extraapiservercertsans/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/extraapiservercertsans/variables_test.go rename to pkg/handlers/generic/mutation/kubeadm/extraapiservercertsans/variables_test.go diff --git a/pkg/handlers/generic/mutation/kubernetesimagerepository/inject.go b/pkg/handlers/generic/mutation/kubeadm/kubernetesimagerepository/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/kubernetesimagerepository/inject.go rename to pkg/handlers/generic/mutation/kubeadm/kubernetesimagerepository/inject.go diff --git a/pkg/handlers/generic/mutation/kubernetesimagerepository/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/kubernetesimagerepository/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/kubernetesimagerepository/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/kubernetesimagerepository/inject_test.go diff --git a/pkg/handlers/generic/mutation/kubernetesimagerepository/variables_test.go b/pkg/handlers/generic/mutation/kubeadm/kubernetesimagerepository/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/kubernetesimagerepository/variables_test.go rename to pkg/handlers/generic/mutation/kubeadm/kubernetesimagerepository/variables_test.go diff --git a/pkg/handlers/generic/mutation/noderegistration/inject_controlplane.go b/pkg/handlers/generic/mutation/kubeadm/noderegistration/inject_controlplane.go similarity index 100% rename from pkg/handlers/generic/mutation/noderegistration/inject_controlplane.go rename to pkg/handlers/generic/mutation/kubeadm/noderegistration/inject_controlplane.go diff --git a/pkg/handlers/generic/mutation/noderegistration/inject_controlplane_test.go b/pkg/handlers/generic/mutation/kubeadm/noderegistration/inject_controlplane_test.go similarity index 100% rename from pkg/handlers/generic/mutation/noderegistration/inject_controlplane_test.go rename to pkg/handlers/generic/mutation/kubeadm/noderegistration/inject_controlplane_test.go diff --git a/pkg/handlers/generic/mutation/noderegistration/inject_suite_test.go b/pkg/handlers/generic/mutation/kubeadm/noderegistration/inject_suite_test.go similarity index 100% rename from pkg/handlers/generic/mutation/noderegistration/inject_suite_test.go rename to pkg/handlers/generic/mutation/kubeadm/noderegistration/inject_suite_test.go diff --git a/pkg/handlers/generic/mutation/noderegistration/inject_worker.go b/pkg/handlers/generic/mutation/kubeadm/noderegistration/inject_worker.go similarity index 100% rename from pkg/handlers/generic/mutation/noderegistration/inject_worker.go rename to pkg/handlers/generic/mutation/kubeadm/noderegistration/inject_worker.go diff --git a/pkg/handlers/generic/mutation/noderegistration/inject_worker_test.go b/pkg/handlers/generic/mutation/kubeadm/noderegistration/inject_worker_test.go similarity index 100% rename from pkg/handlers/generic/mutation/noderegistration/inject_worker_test.go rename to pkg/handlers/generic/mutation/kubeadm/noderegistration/inject_worker_test.go diff --git a/pkg/handlers/generic/mutation/noderegistration/variables_test.go b/pkg/handlers/generic/mutation/kubeadm/noderegistration/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/noderegistration/variables_test.go rename to pkg/handlers/generic/mutation/kubeadm/noderegistration/variables_test.go diff --git a/pkg/handlers/generic/mutation/parallelimagepulls/embedded/kubeletconfigpatch.yaml b/pkg/handlers/generic/mutation/kubeadm/parallelimagepulls/embedded/kubeletconfigpatch.yaml similarity index 100% rename from pkg/handlers/generic/mutation/parallelimagepulls/embedded/kubeletconfigpatch.yaml rename to pkg/handlers/generic/mutation/kubeadm/parallelimagepulls/embedded/kubeletconfigpatch.yaml diff --git a/pkg/handlers/generic/mutation/parallelimagepulls/inject.go b/pkg/handlers/generic/mutation/kubeadm/parallelimagepulls/inject.go similarity index 100% rename from pkg/handlers/generic/mutation/parallelimagepulls/inject.go rename to pkg/handlers/generic/mutation/kubeadm/parallelimagepulls/inject.go diff --git a/pkg/handlers/generic/mutation/parallelimagepulls/inject_test.go b/pkg/handlers/generic/mutation/kubeadm/parallelimagepulls/inject_test.go similarity index 100% rename from pkg/handlers/generic/mutation/parallelimagepulls/inject_test.go rename to pkg/handlers/generic/mutation/kubeadm/parallelimagepulls/inject_test.go diff --git a/pkg/handlers/generic/mutation/parallelimagepulls/variables_test.go b/pkg/handlers/generic/mutation/kubeadm/parallelimagepulls/variables_test.go similarity index 100% rename from pkg/handlers/generic/mutation/parallelimagepulls/variables_test.go rename to pkg/handlers/generic/mutation/kubeadm/parallelimagepulls/variables_test.go diff --git a/pkg/handlers/generic/lifecycle/addons/helmaddon.go b/pkg/handlers/lifecycle/addons/helmaddon.go similarity index 99% rename from pkg/handlers/generic/lifecycle/addons/helmaddon.go rename to pkg/handlers/lifecycle/addons/helmaddon.go index d920dd901..d7e4be095 100644 --- a/pkg/handlers/generic/lifecycle/addons/helmaddon.go +++ b/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/pkg/handlers/generic/lifecycle/addons/interfaces.go b/pkg/handlers/lifecycle/addons/interfaces.go similarity index 100% rename from pkg/handlers/generic/lifecycle/addons/interfaces.go rename to pkg/handlers/lifecycle/addons/interfaces.go diff --git a/pkg/handlers/generic/lifecycle/addons/test.go b/pkg/handlers/lifecycle/addons/test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/addons/test.go rename to pkg/handlers/lifecycle/addons/test.go diff --git a/pkg/handlers/generic/lifecycle/ccm/aws/handler.go b/pkg/handlers/lifecycle/ccm/aws/handler.go similarity index 97% rename from pkg/handlers/generic/lifecycle/ccm/aws/handler.go rename to pkg/handlers/lifecycle/ccm/aws/handler.go index 6c51c2c1f..894a128c0 100644 --- a/pkg/handlers/generic/lifecycle/ccm/aws/handler.go +++ b/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/pkg/handlers/generic/lifecycle/ccm/aws/handler_test.go b/pkg/handlers/lifecycle/ccm/aws/handler_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/ccm/aws/handler_test.go rename to pkg/handlers/lifecycle/ccm/aws/handler_test.go diff --git a/pkg/handlers/generic/lifecycle/ccm/aws/strategy_crs.go b/pkg/handlers/lifecycle/ccm/aws/strategy_crs.go similarity index 100% rename from pkg/handlers/generic/lifecycle/ccm/aws/strategy_crs.go rename to pkg/handlers/lifecycle/ccm/aws/strategy_crs.go diff --git a/pkg/handlers/generic/lifecycle/ccm/doc.go b/pkg/handlers/lifecycle/ccm/doc.go similarity index 100% rename from pkg/handlers/generic/lifecycle/ccm/doc.go rename to pkg/handlers/lifecycle/ccm/doc.go diff --git a/pkg/handlers/generic/lifecycle/ccm/handler.go b/pkg/handlers/lifecycle/ccm/handler.go similarity index 100% rename from pkg/handlers/generic/lifecycle/ccm/handler.go rename to pkg/handlers/lifecycle/ccm/handler.go diff --git a/pkg/handlers/generic/lifecycle/ccm/nutanix/handler.go b/pkg/handlers/lifecycle/ccm/nutanix/handler.go similarity index 98% rename from pkg/handlers/generic/lifecycle/ccm/nutanix/handler.go rename to pkg/handlers/lifecycle/ccm/nutanix/handler.go index 1fd287e1b..0a2f6335c 100644 --- a/pkg/handlers/generic/lifecycle/ccm/nutanix/handler.go +++ b/pkg/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/pkg/handlers/generic/lifecycle/ccm/nutanix/handler_test.go b/pkg/handlers/lifecycle/ccm/nutanix/handler_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/ccm/nutanix/handler_test.go rename to pkg/handlers/lifecycle/ccm/nutanix/handler_test.go diff --git a/pkg/handlers/generic/lifecycle/clusterautoscaler/doc.go b/pkg/handlers/lifecycle/clusterautoscaler/doc.go similarity index 100% rename from pkg/handlers/generic/lifecycle/clusterautoscaler/doc.go rename to pkg/handlers/lifecycle/clusterautoscaler/doc.go diff --git a/pkg/handlers/generic/lifecycle/clusterautoscaler/handler.go b/pkg/handlers/lifecycle/clusterautoscaler/handler.go similarity index 99% rename from pkg/handlers/generic/lifecycle/clusterautoscaler/handler.go rename to pkg/handlers/lifecycle/clusterautoscaler/handler.go index 7dfd1e86d..3bd7a63ee 100644 --- a/pkg/handlers/generic/lifecycle/clusterautoscaler/handler.go +++ b/pkg/handlers/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/pkg/handlers/generic/lifecycle/clusterautoscaler/strategy_crs.go b/pkg/handlers/lifecycle/clusterautoscaler/strategy_crs.go similarity index 100% rename from pkg/handlers/generic/lifecycle/clusterautoscaler/strategy_crs.go rename to pkg/handlers/lifecycle/clusterautoscaler/strategy_crs.go diff --git a/pkg/handlers/generic/lifecycle/clusterautoscaler/strategy_helmaddon.go b/pkg/handlers/lifecycle/clusterautoscaler/strategy_helmaddon.go similarity index 96% rename from pkg/handlers/generic/lifecycle/clusterautoscaler/strategy_helmaddon.go rename to pkg/handlers/lifecycle/clusterautoscaler/strategy_helmaddon.go index 914666688..c609c8c14 100644 --- a/pkg/handlers/generic/lifecycle/clusterautoscaler/strategy_helmaddon.go +++ b/pkg/handlers/lifecycle/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/pkg/handlers/generic/lifecycle/clusterautoscaler/template.go b/pkg/handlers/lifecycle/clusterautoscaler/template.go similarity index 100% rename from pkg/handlers/generic/lifecycle/clusterautoscaler/template.go rename to pkg/handlers/lifecycle/clusterautoscaler/template.go diff --git a/pkg/handlers/generic/lifecycle/clusterautoscaler/template_test.go b/pkg/handlers/lifecycle/clusterautoscaler/template_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/clusterautoscaler/template_test.go rename to pkg/handlers/lifecycle/clusterautoscaler/template_test.go diff --git a/pkg/handlers/generic/lifecycle/clusterautoscaler/utils.go b/pkg/handlers/lifecycle/clusterautoscaler/utils.go similarity index 100% rename from pkg/handlers/generic/lifecycle/clusterautoscaler/utils.go rename to pkg/handlers/lifecycle/clusterautoscaler/utils.go diff --git a/pkg/handlers/generic/lifecycle/clusterautoscaler/variables_test.go b/pkg/handlers/lifecycle/clusterautoscaler/variables_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/clusterautoscaler/variables_test.go rename to pkg/handlers/lifecycle/clusterautoscaler/variables_test.go diff --git a/pkg/handlers/generic/lifecycle/cni/calico/doc.go b/pkg/handlers/lifecycle/cni/calico/doc.go similarity index 100% rename from pkg/handlers/generic/lifecycle/cni/calico/doc.go rename to pkg/handlers/lifecycle/cni/calico/doc.go diff --git a/pkg/handlers/generic/lifecycle/cni/calico/handler.go b/pkg/handlers/lifecycle/cni/calico/handler.go similarity index 99% rename from pkg/handlers/generic/lifecycle/cni/calico/handler.go rename to pkg/handlers/lifecycle/cni/calico/handler.go index 3ee409088..c466e2b9b 100644 --- a/pkg/handlers/generic/lifecycle/cni/calico/handler.go +++ b/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/pkg/handlers/generic/lifecycle/cni/calico/strategy_crs.go b/pkg/handlers/lifecycle/cni/calico/strategy_crs.go similarity index 99% rename from pkg/handlers/generic/lifecycle/cni/calico/strategy_crs.go rename to pkg/handlers/lifecycle/cni/calico/strategy_crs.go index 48c5d8193..d42a5342c 100644 --- a/pkg/handlers/generic/lifecycle/cni/calico/strategy_crs.go +++ b/pkg/handlers/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/pkg/handlers/generic/lifecycle/cni/calico/strategy_helmaddon.go b/pkg/handlers/lifecycle/cni/calico/strategy_helmaddon.go similarity index 95% rename from pkg/handlers/generic/lifecycle/cni/calico/strategy_helmaddon.go rename to pkg/handlers/lifecycle/cni/calico/strategy_helmaddon.go index 11d8a4765..fa4e1166e 100644 --- a/pkg/handlers/generic/lifecycle/cni/calico/strategy_helmaddon.go +++ b/pkg/handlers/lifecycle/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/pkg/handlers/generic/lifecycle/cni/cilium/doc.go b/pkg/handlers/lifecycle/cni/cilium/doc.go similarity index 100% rename from pkg/handlers/generic/lifecycle/cni/cilium/doc.go rename to pkg/handlers/lifecycle/cni/cilium/doc.go diff --git a/pkg/handlers/generic/lifecycle/cni/cilium/handler.go b/pkg/handlers/lifecycle/cni/cilium/handler.go similarity index 99% rename from pkg/handlers/generic/lifecycle/cni/cilium/handler.go rename to pkg/handlers/lifecycle/cni/cilium/handler.go index 287fda85f..320407b0d 100644 --- a/pkg/handlers/generic/lifecycle/cni/cilium/handler.go +++ b/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/pkg/handlers/generic/lifecycle/cni/cilium/handler_integration_test.go b/pkg/handlers/lifecycle/cni/cilium/handler_integration_test.go similarity index 99% rename from pkg/handlers/generic/lifecycle/cni/cilium/handler_integration_test.go rename to pkg/handlers/lifecycle/cni/cilium/handler_integration_test.go index 487c0bfac..5c7e2dcef 100644 --- a/pkg/handlers/generic/lifecycle/cni/cilium/handler_integration_test.go +++ b/pkg/handlers/lifecycle/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/pkg/handlers/generic/lifecycle/cni/cilium/strategy_crs.go b/pkg/handlers/lifecycle/cni/cilium/strategy_crs.go similarity index 100% rename from pkg/handlers/generic/lifecycle/cni/cilium/strategy_crs.go rename to pkg/handlers/lifecycle/cni/cilium/strategy_crs.go diff --git a/pkg/handlers/generic/lifecycle/cni/cilium/template.go b/pkg/handlers/lifecycle/cni/cilium/template.go similarity index 100% rename from pkg/handlers/generic/lifecycle/cni/cilium/template.go rename to pkg/handlers/lifecycle/cni/cilium/template.go diff --git a/pkg/handlers/generic/lifecycle/cni/cilium/template_test.go b/pkg/handlers/lifecycle/cni/cilium/template_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/cni/cilium/template_test.go rename to pkg/handlers/lifecycle/cni/cilium/template_test.go diff --git a/pkg/handlers/generic/lifecycle/cni/cilium/utils_suite_test.go b/pkg/handlers/lifecycle/cni/cilium/utils_suite_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/cni/cilium/utils_suite_test.go rename to pkg/handlers/lifecycle/cni/cilium/utils_suite_test.go diff --git a/pkg/handlers/generic/lifecycle/cni/cluster.go b/pkg/handlers/lifecycle/cni/cluster.go similarity index 100% rename from pkg/handlers/generic/lifecycle/cni/cluster.go rename to pkg/handlers/lifecycle/cni/cluster.go diff --git a/pkg/handlers/generic/lifecycle/cni/cluster_test.go b/pkg/handlers/lifecycle/cni/cluster_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/cni/cluster_test.go rename to pkg/handlers/lifecycle/cni/cluster_test.go diff --git a/pkg/handlers/generic/lifecycle/cni/constants.go b/pkg/handlers/lifecycle/cni/constants.go similarity index 100% rename from pkg/handlers/generic/lifecycle/cni/constants.go rename to pkg/handlers/lifecycle/cni/constants.go diff --git a/pkg/handlers/generic/lifecycle/cni/variables_test.go b/pkg/handlers/lifecycle/cni/variables_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/cni/variables_test.go rename to pkg/handlers/lifecycle/cni/variables_test.go diff --git a/pkg/handlers/generic/lifecycle/config/cm.go b/pkg/handlers/lifecycle/config/cm.go similarity index 100% rename from pkg/handlers/generic/lifecycle/config/cm.go rename to pkg/handlers/lifecycle/config/cm.go diff --git a/pkg/handlers/generic/lifecycle/cosi/doc.go b/pkg/handlers/lifecycle/cosi/doc.go similarity index 100% rename from pkg/handlers/generic/lifecycle/cosi/doc.go rename to pkg/handlers/lifecycle/cosi/doc.go diff --git a/pkg/handlers/generic/lifecycle/cosi/handler.go b/pkg/handlers/lifecycle/cosi/handler.go similarity index 98% rename from pkg/handlers/generic/lifecycle/cosi/handler.go rename to pkg/handlers/lifecycle/cosi/handler.go index 7713dcca1..254f4e961 100644 --- a/pkg/handlers/generic/lifecycle/cosi/handler.go +++ b/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/pkg/handlers/generic/lifecycle/cosi/variables_test.go b/pkg/handlers/lifecycle/cosi/variables_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/cosi/variables_test.go rename to pkg/handlers/lifecycle/cosi/variables_test.go diff --git a/pkg/handlers/generic/lifecycle/csi/awsebs/handler.go b/pkg/handlers/lifecycle/csi/awsebs/handler.go similarity index 95% rename from pkg/handlers/generic/lifecycle/csi/awsebs/handler.go rename to pkg/handlers/lifecycle/csi/awsebs/handler.go index 10abee8b1..8bc519dcf 100644 --- a/pkg/handlers/generic/lifecycle/csi/awsebs/handler.go +++ b/pkg/handlers/lifecycle/csi/awsebs/handler.go @@ -14,9 +14,9 @@ import ( ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/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" - csiutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/csi/utils" + "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" + csiutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/csi/utils" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options" ) diff --git a/pkg/handlers/generic/lifecycle/csi/awsebs/strategy_crs.go b/pkg/handlers/lifecycle/csi/awsebs/strategy_crs.go similarity index 100% rename from pkg/handlers/generic/lifecycle/csi/awsebs/strategy_crs.go rename to pkg/handlers/lifecycle/csi/awsebs/strategy_crs.go diff --git a/pkg/handlers/generic/lifecycle/csi/doc.go b/pkg/handlers/lifecycle/csi/doc.go similarity index 100% rename from pkg/handlers/generic/lifecycle/csi/doc.go rename to pkg/handlers/lifecycle/csi/doc.go diff --git a/pkg/handlers/generic/lifecycle/csi/handler.go b/pkg/handlers/lifecycle/csi/handler.go similarity index 100% rename from pkg/handlers/generic/lifecycle/csi/handler.go rename to pkg/handlers/lifecycle/csi/handler.go diff --git a/pkg/handlers/generic/lifecycle/csi/handler_test.go b/pkg/handlers/lifecycle/csi/handler_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/csi/handler_test.go rename to pkg/handlers/lifecycle/csi/handler_test.go diff --git a/pkg/handlers/generic/lifecycle/csi/localpath/handler.go b/pkg/handlers/lifecycle/csi/localpath/handler.go similarity index 95% rename from pkg/handlers/generic/lifecycle/csi/localpath/handler.go rename to pkg/handlers/lifecycle/csi/localpath/handler.go index 75cbb928d..e87c7ec9b 100644 --- a/pkg/handlers/generic/lifecycle/csi/localpath/handler.go +++ b/pkg/handlers/lifecycle/csi/localpath/handler.go @@ -14,9 +14,9 @@ import ( ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/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" - csiutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/csi/utils" + "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" + csiutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/csi/utils" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options" ) diff --git a/pkg/handlers/generic/lifecycle/csi/localpath/strategy_crs.go b/pkg/handlers/lifecycle/csi/localpath/strategy_crs.go similarity index 100% rename from pkg/handlers/generic/lifecycle/csi/localpath/strategy_crs.go rename to pkg/handlers/lifecycle/csi/localpath/strategy_crs.go diff --git a/pkg/handlers/generic/lifecycle/csi/nutanix/handler.go b/pkg/handlers/lifecycle/csi/nutanix/handler.go similarity index 96% rename from pkg/handlers/generic/lifecycle/csi/nutanix/handler.go rename to pkg/handlers/lifecycle/csi/nutanix/handler.go index 8e9eed6de..532468be7 100644 --- a/pkg/handlers/generic/lifecycle/csi/nutanix/handler.go +++ b/pkg/handlers/lifecycle/csi/nutanix/handler.go @@ -14,9 +14,9 @@ import ( ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/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" - csiutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/csi/utils" + "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" + csiutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/csi/utils" "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/pkg/handlers/generic/lifecycle/csi/snapshotcontroller/handler.go b/pkg/handlers/lifecycle/csi/snapshotcontroller/handler.go similarity index 98% rename from pkg/handlers/generic/lifecycle/csi/snapshotcontroller/handler.go rename to pkg/handlers/lifecycle/csi/snapshotcontroller/handler.go index 80afe8c60..6f59ba41f 100644 --- a/pkg/handlers/generic/lifecycle/csi/snapshotcontroller/handler.go +++ b/pkg/handlers/lifecycle/csi/snapshotcontroller/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/pkg/handlers/generic/lifecycle/csi/snapshotcontroller/strategy_crs.go b/pkg/handlers/lifecycle/csi/snapshotcontroller/strategy_crs.go similarity index 100% rename from pkg/handlers/generic/lifecycle/csi/snapshotcontroller/strategy_crs.go rename to pkg/handlers/lifecycle/csi/snapshotcontroller/strategy_crs.go diff --git a/pkg/handlers/generic/lifecycle/csi/utils/scs.go b/pkg/handlers/lifecycle/csi/utils/scs.go similarity index 100% rename from pkg/handlers/generic/lifecycle/csi/utils/scs.go rename to pkg/handlers/lifecycle/csi/utils/scs.go diff --git a/pkg/handlers/generic/lifecycle/csi/utils/scs_test.go b/pkg/handlers/lifecycle/csi/utils/scs_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/csi/utils/scs_test.go rename to pkg/handlers/lifecycle/csi/utils/scs_test.go diff --git a/pkg/handlers/generic/lifecycle/csi/variables_test.go b/pkg/handlers/lifecycle/csi/variables_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/csi/variables_test.go rename to pkg/handlers/lifecycle/csi/variables_test.go diff --git a/pkg/handlers/generic/lifecycle/handlers.go b/pkg/handlers/lifecycle/handlers.go similarity index 89% rename from pkg/handlers/generic/lifecycle/handlers.go rename to pkg/handlers/lifecycle/handlers.go index bd3034430..38704c0f4 100644 --- a/pkg/handlers/generic/lifecycle/handlers.go +++ b/pkg/handlers/lifecycle/handlers.go @@ -11,25 +11,25 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "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/pkg/handlers/generic/lifecycle/ccm" - awsccm "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/ccm/aws" - nutanixccm "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/ccm/nutanix" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/clusterautoscaler" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/cni/calico" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/cni/cilium" - "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/generic/lifecycle/cosi" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/csi" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/csi/awsebs" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/csi/localpath" - nutanixcsi "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/csi/nutanix" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/csi/snapshotcontroller" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/nfd" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/registry" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/registry/cncfdistribution" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/servicelbgc" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/serviceloadbalancer" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/serviceloadbalancer/metallb" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/ccm" + awsccm "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/ccm/aws" + nutanixccm "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/ccm/nutanix" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/clusterautoscaler" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/cni/calico" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/cni/cilium" + "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/lifecycle/cosi" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/csi" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/csi/awsebs" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/csi/localpath" + nutanixcsi "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/csi/nutanix" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/csi/snapshotcontroller" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/nfd" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/registry" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/registry/cncfdistribution" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/servicelbgc" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/serviceloadbalancer" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/serviceloadbalancer/metallb" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options" ) diff --git a/pkg/handlers/generic/lifecycle/nfd/doc.go b/pkg/handlers/lifecycle/nfd/doc.go similarity index 100% rename from pkg/handlers/generic/lifecycle/nfd/doc.go rename to pkg/handlers/lifecycle/nfd/doc.go diff --git a/pkg/handlers/generic/lifecycle/nfd/handler.go b/pkg/handlers/lifecycle/nfd/handler.go similarity index 98% rename from pkg/handlers/generic/lifecycle/nfd/handler.go rename to pkg/handlers/lifecycle/nfd/handler.go index 470b5136d..9241984ce 100644 --- a/pkg/handlers/generic/lifecycle/nfd/handler.go +++ b/pkg/handlers/lifecycle/nfd/handler.go @@ -17,8 +17,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/pkg/handlers/generic/lifecycle/nfd/strategy_crs.go b/pkg/handlers/lifecycle/nfd/strategy_crs.go similarity index 100% rename from pkg/handlers/generic/lifecycle/nfd/strategy_crs.go rename to pkg/handlers/lifecycle/nfd/strategy_crs.go diff --git a/pkg/handlers/generic/lifecycle/nfd/variables_test.go b/pkg/handlers/lifecycle/nfd/variables_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/nfd/variables_test.go rename to pkg/handlers/lifecycle/nfd/variables_test.go diff --git a/pkg/handlers/generic/lifecycle/registry/cncfdistribution/handler.go b/pkg/handlers/lifecycle/registry/cncfdistribution/handler.go similarity index 96% rename from pkg/handlers/generic/lifecycle/registry/cncfdistribution/handler.go rename to pkg/handlers/lifecycle/registry/cncfdistribution/handler.go index 6f47bfc89..47de5edcb 100644 --- a/pkg/handlers/generic/lifecycle/registry/cncfdistribution/handler.go +++ b/pkg/handlers/lifecycle/registry/cncfdistribution/handler.go @@ -15,10 +15,10 @@ import ( ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/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/generic/lifecycle/registry/syncer" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/registry/utils" + "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/lifecycle/registry/syncer" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/registry/utils" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options" ) diff --git a/pkg/handlers/generic/lifecycle/registry/doc.go b/pkg/handlers/lifecycle/registry/doc.go similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/doc.go rename to pkg/handlers/lifecycle/registry/doc.go diff --git a/pkg/handlers/generic/lifecycle/registry/handler.go b/pkg/handlers/lifecycle/registry/handler.go similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/handler.go rename to pkg/handlers/lifecycle/registry/handler.go diff --git a/pkg/handlers/generic/lifecycle/registry/syncer/syncer.go b/pkg/handlers/lifecycle/registry/syncer/syncer.go similarity index 98% rename from pkg/handlers/generic/lifecycle/registry/syncer/syncer.go rename to pkg/handlers/lifecycle/registry/syncer/syncer.go index fc977bf97..a8c1d395d 100644 --- a/pkg/handlers/generic/lifecycle/registry/syncer/syncer.go +++ b/pkg/handlers/lifecycle/registry/syncer/syncer.go @@ -19,9 +19,9 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/variables" capiutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/utils" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/feature" - "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/generic/lifecycle/registry/utils" + "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/lifecycle/registry/utils" "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/pkg/handlers/generic/lifecycle/registry/syncer/syncer_integration_test.go b/pkg/handlers/lifecycle/registry/syncer/syncer_integration_test.go similarity index 99% rename from pkg/handlers/generic/lifecycle/registry/syncer/syncer_integration_test.go rename to pkg/handlers/lifecycle/registry/syncer/syncer_integration_test.go index 0b3e05dab..3fed82393 100644 --- a/pkg/handlers/generic/lifecycle/registry/syncer/syncer_integration_test.go +++ b/pkg/handlers/lifecycle/registry/syncer/syncer_integration_test.go @@ -23,7 +23,7 @@ import ( carenv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/variables" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/feature" - "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" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/generic/lifecycle/registry/syncer/syncer_suite_test.go b/pkg/handlers/lifecycle/registry/syncer/syncer_suite_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/syncer/syncer_suite_test.go rename to pkg/handlers/lifecycle/registry/syncer/syncer_suite_test.go diff --git a/pkg/handlers/generic/lifecycle/registry/syncer/syncer_test.go b/pkg/handlers/lifecycle/registry/syncer/syncer_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/syncer/syncer_test.go rename to pkg/handlers/lifecycle/registry/syncer/syncer_test.go diff --git a/pkg/handlers/generic/lifecycle/registry/syncer/testdata/registry-syncer-template.yaml.tmpl b/pkg/handlers/lifecycle/registry/syncer/testdata/registry-syncer-template.yaml.tmpl similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/syncer/testdata/registry-syncer-template.yaml.tmpl rename to pkg/handlers/lifecycle/registry/syncer/testdata/registry-syncer-template.yaml.tmpl diff --git a/pkg/handlers/generic/lifecycle/registry/syncer/testdata/registry-syncer-values.yaml b/pkg/handlers/lifecycle/registry/syncer/testdata/registry-syncer-values.yaml similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/syncer/testdata/registry-syncer-values.yaml rename to pkg/handlers/lifecycle/registry/syncer/testdata/registry-syncer-values.yaml diff --git a/pkg/handlers/generic/lifecycle/registry/utils/ip.go b/pkg/handlers/lifecycle/registry/utils/ip.go similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/utils/ip.go rename to pkg/handlers/lifecycle/registry/utils/ip.go diff --git a/pkg/handlers/generic/lifecycle/registry/utils/ip_test.go b/pkg/handlers/lifecycle/registry/utils/ip_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/utils/ip_test.go rename to pkg/handlers/lifecycle/registry/utils/ip_test.go diff --git a/pkg/handlers/generic/lifecycle/registry/utils/registry_metadata.go b/pkg/handlers/lifecycle/registry/utils/registry_metadata.go similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/utils/registry_metadata.go rename to pkg/handlers/lifecycle/registry/utils/registry_metadata.go diff --git a/pkg/handlers/generic/lifecycle/registry/utils/registry_metadata_test.go b/pkg/handlers/lifecycle/registry/utils/registry_metadata_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/utils/registry_metadata_test.go rename to pkg/handlers/lifecycle/registry/utils/registry_metadata_test.go diff --git a/pkg/handlers/generic/lifecycle/registry/utils/tls.go b/pkg/handlers/lifecycle/registry/utils/tls.go similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/utils/tls.go rename to pkg/handlers/lifecycle/registry/utils/tls.go diff --git a/pkg/handlers/generic/lifecycle/registry/utils/tls_integration_test.go b/pkg/handlers/lifecycle/registry/utils/tls_integration_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/utils/tls_integration_test.go rename to pkg/handlers/lifecycle/registry/utils/tls_integration_test.go diff --git a/pkg/handlers/generic/lifecycle/registry/utils/tls_test.go b/pkg/handlers/lifecycle/registry/utils/tls_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/utils/tls_test.go rename to pkg/handlers/lifecycle/registry/utils/tls_test.go diff --git a/pkg/handlers/generic/lifecycle/registry/utils/utils_suite_test.go b/pkg/handlers/lifecycle/registry/utils/utils_suite_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/registry/utils/utils_suite_test.go rename to pkg/handlers/lifecycle/registry/utils/utils_suite_test.go diff --git a/pkg/handlers/generic/lifecycle/servicelbgc/deleter.go b/pkg/handlers/lifecycle/servicelbgc/deleter.go similarity index 100% rename from pkg/handlers/generic/lifecycle/servicelbgc/deleter.go rename to pkg/handlers/lifecycle/servicelbgc/deleter.go diff --git a/pkg/handlers/generic/lifecycle/servicelbgc/deleter_test.go b/pkg/handlers/lifecycle/servicelbgc/deleter_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/servicelbgc/deleter_test.go rename to pkg/handlers/lifecycle/servicelbgc/deleter_test.go diff --git a/pkg/handlers/generic/lifecycle/servicelbgc/doc.go b/pkg/handlers/lifecycle/servicelbgc/doc.go similarity index 100% rename from pkg/handlers/generic/lifecycle/servicelbgc/doc.go rename to pkg/handlers/lifecycle/servicelbgc/doc.go diff --git a/pkg/handlers/generic/lifecycle/servicelbgc/handler.go b/pkg/handlers/lifecycle/servicelbgc/handler.go similarity index 100% rename from pkg/handlers/generic/lifecycle/servicelbgc/handler.go rename to pkg/handlers/lifecycle/servicelbgc/handler.go diff --git a/pkg/handlers/generic/lifecycle/serviceloadbalancer/handler.go b/pkg/handlers/lifecycle/serviceloadbalancer/handler.go similarity index 100% rename from pkg/handlers/generic/lifecycle/serviceloadbalancer/handler.go rename to pkg/handlers/lifecycle/serviceloadbalancer/handler.go diff --git a/pkg/handlers/generic/lifecycle/serviceloadbalancer/handler_test.go b/pkg/handlers/lifecycle/serviceloadbalancer/handler_test.go similarity index 100% rename from pkg/handlers/generic/lifecycle/serviceloadbalancer/handler_test.go rename to pkg/handlers/lifecycle/serviceloadbalancer/handler_test.go diff --git a/pkg/handlers/generic/lifecycle/serviceloadbalancer/metallb/configuration.go b/pkg/handlers/lifecycle/serviceloadbalancer/metallb/configuration.go similarity index 100% rename from pkg/handlers/generic/lifecycle/serviceloadbalancer/metallb/configuration.go rename to pkg/handlers/lifecycle/serviceloadbalancer/metallb/configuration.go diff --git a/pkg/handlers/generic/lifecycle/serviceloadbalancer/metallb/handler.go b/pkg/handlers/lifecycle/serviceloadbalancer/metallb/handler.go similarity index 98% rename from pkg/handlers/generic/lifecycle/serviceloadbalancer/metallb/handler.go rename to pkg/handlers/lifecycle/serviceloadbalancer/metallb/handler.go index 26a8a19e9..c37f128c7 100644 --- a/pkg/handlers/generic/lifecycle/serviceloadbalancer/metallb/handler.go +++ b/pkg/handlers/lifecycle/serviceloadbalancer/metallb/handler.go @@ -20,8 +20,8 @@ import ( metallbv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/go.universe.tf/metallb/api/v1beta1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/k8s/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" "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/pkg/handlers/nutanix/mutation/controlplanevirtualip/inject.go b/pkg/handlers/nutanix/mutation/controlplanevirtualip/inject.go index 121402bf5..50aff5aef 100644 --- a/pkg/handlers/nutanix/mutation/controlplanevirtualip/inject.go +++ b/pkg/handlers/nutanix/mutation/controlplanevirtualip/inject.go @@ -5,7 +5,7 @@ package controlplanevirtualip import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/controlplanevirtualip" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubeadm/controlplanevirtualip" ) func NewPatch() *controlplanevirtualip.ControlPlaneVirtualIP { diff --git a/pkg/handlers/v3/generic/mutation/handlers.go b/pkg/handlers/v3/generic/mutation/handlers.go index 4cf0579ea..7d6a9afb2 100644 --- a/pkg/handlers/v3/generic/mutation/handlers.go +++ b/pkg/handlers/v3/generic/mutation/handlers.go @@ -8,21 +8,21 @@ 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/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/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/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/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/mirrors" + "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/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/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/v3/generic/mutation/auditpolicy" ) diff --git a/test/e2e/csi_helpers.go b/test/e2e/csi_helpers.go index 9b072dbc2..0e509edb9 100644 --- a/test/e2e/csi_helpers.go +++ b/test/e2e/csi_helpers.go @@ -26,8 +26,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/csi/awsebs" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/csi/nutanix" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/csi/awsebs" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/csi/nutanix" ) type WaitForCSIToBeReadyInWorkloadClusterInput struct { diff --git a/test/e2e/serviceloadbalancer_helpers.go b/test/e2e/serviceloadbalancer_helpers.go index e8678c76b..2e806eec5 100644 --- a/test/e2e/serviceloadbalancer_helpers.go +++ b/test/e2e/serviceloadbalancer_helpers.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/serviceloadbalancer/metallb" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/lifecycle/serviceloadbalancer/metallb" ) type WaitForServiceLoadBalancerToBeReadyInWorkloadClusterInput struct {