diff --git a/api/v1alpha1/constants.go b/api/v1alpha1/constants.go index d33ba1e36..6dd38da6d 100644 --- a/api/v1alpha1/constants.go +++ b/api/v1alpha1/constants.go @@ -4,16 +4,27 @@ package v1alpha1 const ( + // ClusterConfigVariableName is the meta cluster config patch variable name. + ClusterConfigVariableName = "clusterConfig" + // ControlPlaneConfigVariableName is the control-plane config patch variable name. + ControlPlaneConfigVariableName = "controlPlane" + // WorkerConfigVariableName is the meta worker config patch variable name. + WorkerConfigVariableName = "workerConfig" + + // AWSVariableName is the AWS config patch variable name. + AWSVariableName = "aws" + // DockerVariableName is the Docker config patch variable name. + DockerVariableName = "docker" + // NutanixVariableName is the Nutanix config patch variable name. + NutanixVariableName = "nutanix" + // CNIVariableName is the CNI external patch variable name. CNIVariableName = "cni" // NFDVariableName is the NFD external patch variable name. NFDVariableName = "nfd" + // ClusterAutoscalerVariableName is the cluster-autoscaler external patch variable name. ClusterAutoscalerVariableName = "clusterAutoscaler" - // AWSVariableName is the AWS config patch variable name. - AWSVariableName = "aws" - // NutanixVariableName is the Nutanix config patch variable name. - NutanixVariableName = "nutanix" - // ServiceLoadBalancerName is the Service LoadBalancer config patch variable name. + // ServiceLoadBalancerVariableName is the Service LoadBalancer config patch variable name. ServiceLoadBalancerVariableName = "serviceLoadBalancer" ) diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 1fbf78849..ba57d9a6d 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1144,9 +1144,7 @@ func (in *NutanixNodeSpec) DeepCopy() *NutanixNodeSpec { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *NutanixPrismCentralEndpointCredentials) DeepCopyInto( - out *NutanixPrismCentralEndpointCredentials, -) { +func (in *NutanixPrismCentralEndpointCredentials) DeepCopyInto(out *NutanixPrismCentralEndpointCredentials) { *out = *in out.SecretRef = in.SecretRef } diff --git a/pkg/common/clusterconfig/types.go b/api/variables/aggregate_types.go similarity index 63% rename from pkg/common/clusterconfig/types.go rename to api/variables/aggregate_types.go index 471c8444b..071a0c91a 100644 --- a/pkg/common/clusterconfig/types.go +++ b/api/variables/aggregate_types.go @@ -1,18 +1,19 @@ // Copyright 2024 Nutanix. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package clusterconfig +package variables import carenv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" -// ClusterConfig is a type to be used internally to simplify the handling of cluster configurations for different +// The types here are to be used internally to simplify the handling of cluster configurations for different // providers. It is not meant to be used as a CRD. // By including all the possible configurations for all the providers, we can easily switch between providers in code // without type assertions/switches and avoids passing around `interface{}` or `any` types. // Every provider-specific cluster config variable will successfully unmarshal to this type and so it is safe to use // this internally when a handler provides functionality for multiple providers but exhibits different behaviour per // provider. -type ClusterConfig struct { + +type ClusterConfigSpec struct { AWS *carenv1.AWSSpec `json:"aws,omitempty"` Docker *carenv1.DockerSpec `json:"docker,omitempty"` @@ -21,15 +22,23 @@ type ClusterConfig struct { carenv1.GenericClusterConfigSpec `json:",inline"` - ExtraAPIServerCertSANs []string `json:"extraAPIServerCertSANs,omitempty"` + ControlPlane *ControlPlaneNodeConfigSpec `json:"controlPlane,omitempty"` - ControlPlane *ControlPlaneConfig `json:"controlPlane,omitempty"` + ExtraAPIServerCertSANs []string `json:"extraAPIServerCertSANs,omitempty"` } -type ControlPlaneConfig struct { +type ControlPlaneNodeConfigSpec struct { AWS *carenv1.AWSControlPlaneNodeSpec `json:"aws,omitempty"` - Docker *carenv1.DockerNodeConfigSpec `json:"docker,omitempty"` + Docker *carenv1.DockerNodeSpec `json:"docker,omitempty"` + + Nutanix *carenv1.NutanixNodeSpec `json:"nutanix,omitempty"` +} + +type WorkerNodeConfigSpec struct { + AWS *carenv1.AWSWorkerNodeSpec `json:"aws,omitempty"` + + Docker *carenv1.DockerNodeSpec `json:"docker,omitempty"` - Nutanix *carenv1.NutanixNodeConfigSpec `json:"nutanix,omitempty"` + Nutanix *carenv1.NutanixNodeSpec `json:"nutanix,omitempty"` } diff --git a/api/variables/json.go b/api/variables/json.go index 5c6d83481..625803f54 100644 --- a/api/variables/json.go +++ b/api/variables/json.go @@ -8,6 +8,9 @@ import ( "fmt" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" + + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" ) func MustMarshal(val any) *apiextensionsv1.JSON { @@ -18,3 +21,62 @@ func MustMarshal(val any) *apiextensionsv1.JSON { return &apiextensionsv1.JSON{Raw: marshaled} } + +func MarshalToClusterVariable[T any](name string, obj T) (*clusterv1.ClusterVariable, error) { + marshaled, err := json.Marshal(obj) + if err != nil { + return nil, fmt.Errorf("failed to marshal variable value %q: %w", name, err) + } + return &clusterv1.ClusterVariable{ + Name: name, + Value: apiextensionsv1.JSON{Raw: marshaled}, + }, nil +} + +func UnmarshalClusterConfigVariable(clusterVariables []clusterv1.ClusterVariable) (*ClusterConfigSpec, error) { + variableName := v1alpha1.ClusterConfigVariableName + clusterConfig := GetClusterVariableByName(variableName, clusterVariables) + if clusterConfig == nil { + return nil, nil + } + spec := &ClusterConfigSpec{} + err := UnmarshalClusterVariable(clusterConfig, spec) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal cluster variable %q: %w", variableName, err) + } + + return spec, nil +} + +func UnmarshalWorkerConfigVariable(clusterVariables []clusterv1.ClusterVariable) (*WorkerNodeConfigSpec, error) { + variableName := v1alpha1.WorkerConfigVariableName + workerConfig := GetClusterVariableByName(variableName, clusterVariables) + if workerConfig == nil { + return nil, nil + } + spec := &WorkerNodeConfigSpec{} + err := UnmarshalClusterVariable(workerConfig, spec) + if err != nil { + return nil, fmt.Errorf("failed to unmarshal cluster variable %q: %w", variableName, err) + } + + return spec, nil +} + +func UnmarshalClusterVariable[T any](clusterVariable *clusterv1.ClusterVariable, obj *T) error { + err := json.Unmarshal(clusterVariable.Value.Raw, obj) + if err != nil { + return fmt.Errorf("failed to unmarshal json: %w", err) + } + + return nil +} + +func GetClusterVariableByName(name string, clusterVariables []clusterv1.ClusterVariable) *clusterv1.ClusterVariable { + for _, clusterVar := range clusterVariables { + if clusterVar.Name == name { + return &clusterVar + } + } + return nil +} diff --git a/common/pkg/capi/clustertopology/variables/json.go b/common/pkg/capi/clustertopology/variables/json.go deleted file mode 100644 index 61fb29cd6..000000000 --- a/common/pkg/capi/clustertopology/variables/json.go +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2024 Nutanix. All rights reserved. -// SPDX-License-Identifier: Apache-2.0 - -package variables - -import ( - "encoding/json" - "fmt" - - v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" -) - -func MarshalToClusterVariable[T any](name string, obj T) (*clusterv1.ClusterVariable, error) { - marshaled, err := json.Marshal(obj) - if err != nil { - return nil, fmt.Errorf("failed to marshal variable value %q: %w", name, err) - } - return &clusterv1.ClusterVariable{ - Name: name, - Value: v1.JSON{Raw: marshaled}, - }, nil -} - -func UnmarshalClusterVariable[T any](clusterVariable *clusterv1.ClusterVariable, obj *T) error { - err := json.Unmarshal(clusterVariable.Value.Raw, obj) - if err != nil { - return fmt.Errorf("error unmarshalling variable: %w", err) - } - - return nil -} diff --git a/pkg/handlers/aws/clusterconfig/variables.go b/pkg/handlers/aws/clusterconfig/variables.go index a0a89f6e8..f0a3dc390 100644 --- a/pkg/handlers/aws/clusterconfig/variables.go +++ b/pkg/handlers/aws/clusterconfig/variables.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" 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/mutation" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) var ( @@ -41,7 +40,7 @@ func (h *awsClusterConfigVariableHandler) DiscoverVariables( resp *runtimehooksv1.DiscoverVariablesResponse, ) { resp.Variables = append(resp.Variables, clusterv1.ClusterClassVariable{ - Name: clusterconfig.MetaVariableName, + Name: v1alpha1.ClusterConfigVariableName, Required: true, Schema: v1alpha1.AWSClusterConfig{}.VariableSchema(), }) diff --git a/pkg/handlers/aws/mutation/ami/inject_control_plane.go b/pkg/handlers/aws/mutation/ami/inject_control_plane.go index 0945f1df4..ea4618a72 100644 --- a/pkg/handlers/aws/mutation/ami/inject_control_plane.go +++ b/pkg/handlers/aws/mutation/ami/inject_control_plane.go @@ -7,14 +7,13 @@ import ( capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2" "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/patches/selectors" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) func NewControlPlanePatch() *awsAMISpecPatchHandler { return newAWSAMISpecPatchHandler( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, []string{ - clusterconfig.MetaControlPlaneConfigName, + v1alpha1.ControlPlaneConfigVariableName, v1alpha1.AWSVariableName, VariableName, }, diff --git a/pkg/handlers/aws/mutation/ami/inject_control_plane_test.go b/pkg/handlers/aws/mutation/ami/inject_control_plane_test.go index 9b35e87af..215875dc9 100644 --- a/pkg/handlers/aws/mutation/ami/inject_control_plane_test.go +++ b/pkg/handlers/aws/mutation/ami/inject_control_plane_test.go @@ -12,7 +12,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -29,9 +28,9 @@ var _ = Describe("Generate AMI patches for ControlPlane", func() { Name: "AMI set for control plane", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.AMISpec{ID: "ami-controlplane"}, - clusterconfig.MetaControlPlaneConfigName, + v1alpha1.ControlPlaneConfigVariableName, v1alpha1.AWSVariableName, VariableName, ), @@ -49,7 +48,7 @@ var _ = Describe("Generate AMI patches for ControlPlane", func() { Name: "AMI lookup format set for control plane", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.AMISpec{ Lookup: &v1alpha1.AMILookup{ Format: "test-{{.kubernetesVersion}}-format", @@ -57,7 +56,7 @@ var _ = Describe("Generate AMI patches for ControlPlane", func() { BaseOS: "testOS", }, }, - clusterconfig.MetaControlPlaneConfigName, + v1alpha1.ControlPlaneConfigVariableName, v1alpha1.AWSVariableName, VariableName, ), diff --git a/pkg/handlers/aws/mutation/ami/inject_worker.go b/pkg/handlers/aws/mutation/ami/inject_worker.go index 15faf03a3..efd7e228a 100644 --- a/pkg/handlers/aws/mutation/ami/inject_worker.go +++ b/pkg/handlers/aws/mutation/ami/inject_worker.go @@ -6,12 +6,11 @@ import ( capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2" "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/patches/selectors" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) func NewWorkerPatch() *awsAMISpecPatchHandler { return newAWSAMISpecPatchHandler( - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, []string{ v1alpha1.AWSVariableName, VariableName, diff --git a/pkg/handlers/aws/mutation/ami/inject_worker_test.go b/pkg/handlers/aws/mutation/ami/inject_worker_test.go index b5592c63e..e056894a0 100644 --- a/pkg/handlers/aws/mutation/ami/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/ami/inject_worker_test.go @@ -13,7 +13,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -27,7 +26,7 @@ var _ = Describe("Generate AMI patches for Worker", func() { Name: "AMI set for workers", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, v1alpha1.AMISpec{ID: "ami-controlplane"}, v1alpha1.AWSVariableName, VariableName, @@ -52,7 +51,7 @@ var _ = Describe("Generate AMI patches for Worker", func() { Name: "AMI lookup format set for worker", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, v1alpha1.AMISpec{ Lookup: &v1alpha1.AMILookup{ Format: "test-{{.kubernetesVersion}}-format", diff --git a/pkg/handlers/aws/mutation/ami/variables_test.go b/pkg/handlers/aws/mutation/ami/variables_test.go index 1b471b541..686fa029a 100644 --- a/pkg/handlers/aws/mutation/ami/variables_test.go +++ b/pkg/handlers/aws/mutation/ami/variables_test.go @@ -11,13 +11,12 @@ 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/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, diff --git a/pkg/handlers/aws/mutation/cni/calico/inject.go b/pkg/handlers/aws/mutation/cni/calico/inject.go index 6a9e6da47..f5be3776a 100644 --- a/pkg/handlers/aws/mutation/cni/calico/inject.go +++ b/pkg/handlers/aws/mutation/cni/calico/inject.go @@ -20,7 +20,6 @@ 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/clusterconfig" ) const ( @@ -35,7 +34,7 @@ type calicoPatchHandler struct { func NewPatch() *calicoPatchHandler { return newCalicoPatchHandler( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, "addons", v1alpha1.CNIVariableName, ) diff --git a/pkg/handlers/aws/mutation/cni/calico/inject_test.go b/pkg/handlers/aws/mutation/cni/calico/inject_test.go index 7848238a9..f40331083 100644 --- a/pkg/handlers/aws/mutation/cni/calico/inject_test.go +++ b/pkg/handlers/aws/mutation/cni/calico/inject_test.go @@ -15,7 +15,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -37,7 +36,7 @@ var _ = Describe("Generate AWS Calico CNI ingress patches", func() { Name: "provider set with AWSClusterTemplate", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.CNI{ Provider: v1alpha1.CNIProviderCalico, }, @@ -105,7 +104,7 @@ var _ = Describe("Generate AWS Calico CNI ingress patches", func() { Name: "provider set with AWSClusterTemplate pre-existing rules", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.CNI{ Provider: v1alpha1.CNIProviderCalico, }, @@ -198,7 +197,7 @@ var _ = Describe("Generate AWS Calico CNI ingress patches", func() { Name: "provider set with AWSClusterTemplate conflicting pre-existing rules", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.CNI{ Provider: v1alpha1.CNIProviderCalico, }, diff --git a/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject.go b/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject.go index 65ac98880..4e157d254 100644 --- a/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject.go +++ b/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject.go @@ -18,7 +18,6 @@ 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/clusterconfig" ) const ( @@ -33,7 +32,7 @@ type awsControlPlaneLoadBalancer struct { func NewPatch() *awsControlPlaneLoadBalancer { return newAWSControlPlaneLoadBalancer( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.AWSVariableName, VariableName, ) diff --git a/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject_test.go b/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject_test.go index 599450efe..a6026c384 100644 --- a/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject_test.go +++ b/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject_test.go @@ -15,7 +15,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -37,7 +36,7 @@ var _ = Describe("Generate AWS ControlPlane LoadBalancer patches", func() { Name: "ControlPlaneLoadBalancer scheme set to internet-facing", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.AWSLoadBalancerSpec{ Scheme: &capav1.ELBSchemeInternetFacing, }, @@ -58,7 +57,7 @@ var _ = Describe("Generate AWS ControlPlane LoadBalancer patches", func() { Name: "ControlPlaneLoadBalancer scheme set to internal", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.AWSLoadBalancerSpec{ Scheme: &capav1.ELBSchemeInternal, }, diff --git a/pkg/handlers/aws/mutation/controlplaneloadbalancer/variables_test.go b/pkg/handlers/aws/mutation/controlplaneloadbalancer/variables_test.go index 359eba792..bc4689421 100644 --- a/pkg/handlers/aws/mutation/controlplaneloadbalancer/variables_test.go +++ b/pkg/handlers/aws/mutation/controlplaneloadbalancer/variables_test.go @@ -12,13 +12,12 @@ 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/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane.go index 385caf699..05d70f1a9 100644 --- a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane.go +++ b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane.go @@ -18,7 +18,6 @@ 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/clusterconfig" ) const ( @@ -33,8 +32,8 @@ type awsIAMInstanceProfileControlPlanePatchHandler struct { func NewControlPlanePatch() *awsIAMInstanceProfileControlPlanePatchHandler { return newAWSIAMInstanceProfileControlPlanePatchHandler( - clusterconfig.MetaVariableName, - clusterconfig.MetaControlPlaneConfigName, + v1alpha1.ClusterConfigVariableName, + v1alpha1.ControlPlaneConfigVariableName, v1alpha1.AWSVariableName, VariableName, ) diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane_test.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane_test.go index 21272914d..1a092bdf0 100644 --- a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane_test.go +++ b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane_test.go @@ -12,7 +12,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -33,9 +32,9 @@ var _ = Describe("Generate IAMInstanceProfile patches for ControlPlane", func() Name: "iamInstanceProfile for control plane set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, "control-plane.cluster-api-provider-aws.sigs.k8s.io", - clusterconfig.MetaControlPlaneConfigName, + v1alpha1.ControlPlaneConfigVariableName, v1alpha1.AWSVariableName, VariableName, ), diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker.go index b053996c0..e07043cec 100644 --- a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker.go +++ b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker.go @@ -18,7 +18,6 @@ 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/workerconfig" ) type awsIAMInstanceProfileWorkerPatchHandler struct { @@ -28,7 +27,7 @@ type awsIAMInstanceProfileWorkerPatchHandler struct { func NewWorkerPatch() *awsIAMInstanceProfileWorkerPatchHandler { return newAWSIAMInstanceProfileWorkerPatchHandler( - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, v1alpha1.AWSVariableName, VariableName, ) diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go index 04b913291..72552e3d4 100644 --- a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go @@ -13,7 +13,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -30,7 +29,7 @@ var _ = Describe("Generate IAMInstanceProfile patches for Worker", func() { Name: "iamInstanceProfile for worker set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, "nodes.cluster-api-provider-aws.sigs.k8s.io", v1alpha1.AWSVariableName, VariableName, diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/variables_test.go b/pkg/handlers/aws/mutation/iaminstanceprofile/variables_test.go index bde0567e9..5a0ea9acd 100644 --- a/pkg/handlers/aws/mutation/iaminstanceprofile/variables_test.go +++ b/pkg/handlers/aws/mutation/iaminstanceprofile/variables_test.go @@ -11,13 +11,12 @@ 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/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, diff --git a/pkg/handlers/aws/mutation/instancetype/inject_control_plane.go b/pkg/handlers/aws/mutation/instancetype/inject_control_plane.go index a72f80845..84472494c 100644 --- a/pkg/handlers/aws/mutation/instancetype/inject_control_plane.go +++ b/pkg/handlers/aws/mutation/instancetype/inject_control_plane.go @@ -18,7 +18,6 @@ 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/clusterconfig" ) const ( @@ -33,8 +32,8 @@ type awsInstanceTypeControlPlanePatchHandler struct { func NewControlPlanePatch() *awsInstanceTypeControlPlanePatchHandler { return newAWSInstanceTypeControlPlanePatchHandler( - clusterconfig.MetaVariableName, - clusterconfig.MetaControlPlaneConfigName, + v1alpha1.ClusterConfigVariableName, + v1alpha1.ControlPlaneConfigVariableName, v1alpha1.AWSVariableName, VariableName, ) diff --git a/pkg/handlers/aws/mutation/instancetype/inject_control_plane_test.go b/pkg/handlers/aws/mutation/instancetype/inject_control_plane_test.go index c1cf1d1f5..69ee3dc14 100644 --- a/pkg/handlers/aws/mutation/instancetype/inject_control_plane_test.go +++ b/pkg/handlers/aws/mutation/instancetype/inject_control_plane_test.go @@ -12,7 +12,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -33,9 +32,9 @@ var _ = Describe("Generate InstanceType patches for ControlPlane", func() { Name: "instanceType for controlplane set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, "m5.xlarge", - clusterconfig.MetaControlPlaneConfigName, + v1alpha1.ControlPlaneConfigVariableName, v1alpha1.AWSVariableName, VariableName, ), diff --git a/pkg/handlers/aws/mutation/instancetype/inject_worker.go b/pkg/handlers/aws/mutation/instancetype/inject_worker.go index 379a559a4..e3203bb44 100644 --- a/pkg/handlers/aws/mutation/instancetype/inject_worker.go +++ b/pkg/handlers/aws/mutation/instancetype/inject_worker.go @@ -18,7 +18,6 @@ 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/workerconfig" ) type awsInstanceTypeWorkerPatchHandler struct { @@ -28,7 +27,7 @@ type awsInstanceTypeWorkerPatchHandler struct { func NewWorkerPatch() *awsInstanceTypeWorkerPatchHandler { return newAWSInstanceTypeWorkerPatchHandler( - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, v1alpha1.AWSVariableName, VariableName, ) diff --git a/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go b/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go index 09015072f..f79073d97 100644 --- a/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go @@ -13,7 +13,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -30,7 +29,7 @@ var _ = Describe("Generate InstanceType patches for Worker", func() { Name: "instanceType for workers set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, "m5.2xlarge", v1alpha1.AWSVariableName, VariableName, diff --git a/pkg/handlers/aws/mutation/instancetype/variables_test.go b/pkg/handlers/aws/mutation/instancetype/variables_test.go index 1564adf20..7722d6d75 100644 --- a/pkg/handlers/aws/mutation/instancetype/variables_test.go +++ b/pkg/handlers/aws/mutation/instancetype/variables_test.go @@ -11,13 +11,12 @@ 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/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, diff --git a/pkg/handlers/aws/mutation/network/inject.go b/pkg/handlers/aws/mutation/network/inject.go index a827ca8a3..9bcccac0b 100644 --- a/pkg/handlers/aws/mutation/network/inject.go +++ b/pkg/handlers/aws/mutation/network/inject.go @@ -18,7 +18,6 @@ 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/clusterconfig" ) const ( @@ -33,7 +32,7 @@ type awsNetworkPatchHandler struct { func NewPatch() *awsNetworkPatchHandler { return newAWSPatchPatchHandler( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.AWSVariableName, VariableName, ) diff --git a/pkg/handlers/aws/mutation/network/inject_test.go b/pkg/handlers/aws/mutation/network/inject_test.go index 32dadc144..e8380d1d7 100644 --- a/pkg/handlers/aws/mutation/network/inject_test.go +++ b/pkg/handlers/aws/mutation/network/inject_test.go @@ -14,7 +14,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -36,7 +35,7 @@ var _ = Describe("Generate AWS Network patches", func() { Name: "VPC ID set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.AWSNetwork{ VPC: &v1alpha1.VPC{ ID: "vpc-1234", @@ -57,7 +56,7 @@ var _ = Describe("Generate AWS Network patches", func() { Name: "Subnet IDs set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.AWSNetwork{ Subnets: v1alpha1.Subnets{ {ID: "subnet-1"}, @@ -80,7 +79,7 @@ var _ = Describe("Generate AWS Network patches", func() { Name: "both VPC ID and Subnet IDs set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.AWSNetwork{ VPC: &v1alpha1.VPC{ ID: "vpc-1234", diff --git a/pkg/handlers/aws/mutation/network/variables_test.go b/pkg/handlers/aws/mutation/network/variables_test.go index 10bcf8fb7..abf40cee7 100644 --- a/pkg/handlers/aws/mutation/network/variables_test.go +++ b/pkg/handlers/aws/mutation/network/variables_test.go @@ -11,13 +11,12 @@ 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/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, diff --git a/pkg/handlers/aws/mutation/region/inject.go b/pkg/handlers/aws/mutation/region/inject.go index c5a58d1d4..0c13ea509 100644 --- a/pkg/handlers/aws/mutation/region/inject.go +++ b/pkg/handlers/aws/mutation/region/inject.go @@ -18,7 +18,6 @@ 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/clusterconfig" ) const ( @@ -33,7 +32,7 @@ type awsRegionPatchHandler struct { func NewPatch() *awsRegionPatchHandler { return newAWSRegionPatchHandler( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.AWSVariableName, VariableName, ) diff --git a/pkg/handlers/aws/mutation/region/inject_test.go b/pkg/handlers/aws/mutation/region/inject_test.go index 59f46d7cb..02ecb3e3d 100644 --- a/pkg/handlers/aws/mutation/region/inject_test.go +++ b/pkg/handlers/aws/mutation/region/inject_test.go @@ -14,7 +14,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -37,7 +36,7 @@ var _ = Describe("Generate AWS Region patches", func() { Name: "region set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, "a-specific-region", v1alpha1.AWSVariableName, VariableName, diff --git a/pkg/handlers/aws/mutation/region/variables_test.go b/pkg/handlers/aws/mutation/region/variables_test.go index 934d44398..24e597808 100644 --- a/pkg/handlers/aws/mutation/region/variables_test.go +++ b/pkg/handlers/aws/mutation/region/variables_test.go @@ -11,13 +11,12 @@ 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/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_control_plane.go b/pkg/handlers/aws/mutation/securitygroups/inject_control_plane.go index e868d6351..bca5ec3bd 100644 --- a/pkg/handlers/aws/mutation/securitygroups/inject_control_plane.go +++ b/pkg/handlers/aws/mutation/securitygroups/inject_control_plane.go @@ -7,14 +7,13 @@ import ( capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2" "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/patches/selectors" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) func NewControlPlanePatch() *awsSecurityGroupSpecPatchHandler { return newAWSSecurityGroupSpecPatchHandler( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, []string{ - clusterconfig.MetaControlPlaneConfigName, + v1alpha1.ControlPlaneConfigVariableName, v1alpha1.AWSVariableName, VariableName, }, diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_control_plane_test.go b/pkg/handlers/aws/mutation/securitygroups/inject_control_plane_test.go index 17272d8a4..e30c6c119 100644 --- a/pkg/handlers/aws/mutation/securitygroups/inject_control_plane_test.go +++ b/pkg/handlers/aws/mutation/securitygroups/inject_control_plane_test.go @@ -12,7 +12,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -33,13 +32,13 @@ var _ = Describe("Generate SecurityGroup patches for ControlPlane", func() { Name: "SecurityGroups for controlplane set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.AdditionalSecurityGroup{ {ID: "sg-1"}, {ID: "sg-2"}, {ID: "sg-3"}, }, - clusterconfig.MetaControlPlaneConfigName, + v1alpha1.ControlPlaneConfigVariableName, v1alpha1.AWSVariableName, VariableName, ), diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_worker.go b/pkg/handlers/aws/mutation/securitygroups/inject_worker.go index d4af1897f..bb95d4c9e 100644 --- a/pkg/handlers/aws/mutation/securitygroups/inject_worker.go +++ b/pkg/handlers/aws/mutation/securitygroups/inject_worker.go @@ -6,12 +6,11 @@ import ( capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2" "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/patches/selectors" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) func NewWorkerPatch() *awsSecurityGroupSpecPatchHandler { return newAWSSecurityGroupSpecPatchHandler( - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, []string{ v1alpha1.AWSVariableName, VariableName, diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go b/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go index d6aa2c256..605ab86a7 100644 --- a/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go @@ -13,7 +13,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -30,7 +29,7 @@ var _ = Describe("Generate AWS SecurityGroups patches for Worker", func() { Name: "SecurityGroups for workers set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, v1alpha1.AdditionalSecurityGroup{ {ID: "sg-1"}, {ID: "sg-2"}, diff --git a/pkg/handlers/aws/mutation/securitygroups/variables_test.go b/pkg/handlers/aws/mutation/securitygroups/variables_test.go index 9f6d03152..69a179944 100644 --- a/pkg/handlers/aws/mutation/securitygroups/variables_test.go +++ b/pkg/handlers/aws/mutation/securitygroups/variables_test.go @@ -11,13 +11,12 @@ 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/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, diff --git a/pkg/handlers/aws/workerconfig/variables.go b/pkg/handlers/aws/workerconfig/variables.go index 586cdcd40..e56d63824 100644 --- a/pkg/handlers/aws/workerconfig/variables.go +++ b/pkg/handlers/aws/workerconfig/variables.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" 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/mutation" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) var ( @@ -41,7 +40,7 @@ func (h *awsWorkerConfigVariableHandler) DiscoverVariables( resp *runtimehooksv1.DiscoverVariablesResponse, ) { resp.Variables = append(resp.Variables, clusterv1.ClusterClassVariable{ - Name: workerconfig.MetaVariableName, + Name: v1alpha1.WorkerConfigVariableName, Required: false, Schema: v1alpha1.AWSWorkerNodeConfig{}.VariableSchema(), }) diff --git a/pkg/handlers/aws/workerconfig/variables_test.go b/pkg/handlers/aws/workerconfig/variables_test.go index 52f60a631..0c3bad398 100644 --- a/pkg/handlers/aws/workerconfig/variables_test.go +++ b/pkg/handlers/aws/workerconfig/variables_test.go @@ -10,13 +10,12 @@ 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/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, ptr.To(v1alpha1.AWSWorkerNodeConfig{}.VariableSchema()), false, NewVariable, diff --git a/pkg/handlers/docker/clusterconfig/variables.go b/pkg/handlers/docker/clusterconfig/variables.go index d06c60a35..9087e0700 100644 --- a/pkg/handlers/docker/clusterconfig/variables.go +++ b/pkg/handlers/docker/clusterconfig/variables.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" 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/mutation" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) var ( @@ -23,9 +22,6 @@ var ( const ( // HandlerNameVariable is the name of the variable handler. HandlerNameVariable = "DockerClusterConfigVars" - - // DockerVariableName is the Docker config patch variable name. - DockerVariableName = "docker" ) func NewVariable() *dockerClusterConfigVariableHandler { @@ -44,7 +40,7 @@ func (h *dockerClusterConfigVariableHandler) DiscoverVariables( resp *runtimehooksv1.DiscoverVariablesResponse, ) { resp.Variables = append(resp.Variables, clusterv1.ClusterClassVariable{ - Name: clusterconfig.MetaVariableName, + Name: v1alpha1.ClusterConfigVariableName, Required: true, Schema: v1alpha1.DockerClusterConfig{}.VariableSchema(), }) diff --git a/pkg/handlers/docker/mutation/customimage/inject_control_plane.go b/pkg/handlers/docker/mutation/customimage/inject_control_plane.go index b4245af77..5057f0300 100644 --- a/pkg/handlers/docker/mutation/customimage/inject_control_plane.go +++ b/pkg/handlers/docker/mutation/customimage/inject_control_plane.go @@ -13,12 +13,11 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "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/common/pkg/capi/clustertopology/handlers/mutation" "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" - dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) const ( @@ -35,9 +34,9 @@ type customImageControlPlanePatchHandler struct { func NewControlPlanePatch() *customImageControlPlanePatchHandler { return newCustomImageControlPlanePatchHandler( - clusterconfig.MetaVariableName, - clusterconfig.MetaControlPlaneConfigName, - dockerclusterconfig.DockerVariableName, + v1alpha1.ClusterConfigVariableName, + v1alpha1.ControlPlaneConfigVariableName, + v1alpha1.DockerVariableName, VariableName, ) } diff --git a/pkg/handlers/docker/mutation/customimage/inject_control_plane_test.go b/pkg/handlers/docker/mutation/customimage/inject_control_plane_test.go index 367167537..60aa94ab9 100644 --- a/pkg/handlers/docker/mutation/customimage/inject_control_plane_test.go +++ b/pkg/handlers/docker/mutation/customimage/inject_control_plane_test.go @@ -9,11 +9,10 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" + "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/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -45,10 +44,10 @@ var _ = Describe("Docker CustomImage patches for ControlPlane", func() { Name: "image set for control plane", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, "a-specific-image", - clusterconfig.MetaControlPlaneConfigName, - dockerclusterconfig.DockerVariableName, + v1alpha1.ControlPlaneConfigVariableName, + v1alpha1.DockerVariableName, VariableName, ), capitest.VariableWithValue( diff --git a/pkg/handlers/docker/mutation/customimage/inject_worker.go b/pkg/handlers/docker/mutation/customimage/inject_worker.go index dcdca9dd5..062e2a52d 100644 --- a/pkg/handlers/docker/mutation/customimage/inject_worker.go +++ b/pkg/handlers/docker/mutation/customimage/inject_worker.go @@ -13,12 +13,11 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "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/common/pkg/capi/clustertopology/handlers/mutation" "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" - dockerworkerconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/workerconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) type customImageWorkerPatchHandler struct { @@ -28,8 +27,8 @@ type customImageWorkerPatchHandler struct { func NewWorkerPatch() *customImageWorkerPatchHandler { return newcustomImageWorkerPatchHandler( - workerconfig.MetaVariableName, - dockerworkerconfig.DockerVariableName, + v1alpha1.WorkerConfigVariableName, + v1alpha1.DockerVariableName, VariableName, ) } diff --git a/pkg/handlers/docker/mutation/customimage/inject_worker_test.go b/pkg/handlers/docker/mutation/customimage/inject_worker_test.go index fd781b42b..db5b765bf 100644 --- a/pkg/handlers/docker/mutation/customimage/inject_worker_test.go +++ b/pkg/handlers/docker/mutation/customimage/inject_worker_test.go @@ -9,11 +9,10 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" + "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/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - dockerworkerconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/workerconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -46,9 +45,9 @@ var _ = Describe("Docker CustomImage patches for workers", func() { Name: "image set for workers", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, "a-specific-image", - dockerworkerconfig.DockerVariableName, + v1alpha1.DockerVariableName, VariableName, ), capitest.VariableWithValue( diff --git a/pkg/handlers/docker/mutation/customimage/variables_test.go b/pkg/handlers/docker/mutation/customimage/variables_test.go index 81a862b96..aa2c7828d 100644 --- a/pkg/handlers/docker/mutation/customimage/variables_test.go +++ b/pkg/handlers/docker/mutation/customimage/variables_test.go @@ -11,13 +11,12 @@ 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/testutils/capitest" dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.DockerClusterConfig{}.VariableSchema()), true, dockerclusterconfig.NewVariable, diff --git a/pkg/handlers/docker/workerconfig/variables.go b/pkg/handlers/docker/workerconfig/variables.go index 33f51ecb0..cd790218d 100644 --- a/pkg/handlers/docker/workerconfig/variables.go +++ b/pkg/handlers/docker/workerconfig/variables.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" 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/mutation" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) var ( @@ -23,9 +22,6 @@ var ( const ( // HandlerNameVariable is the name of the variable handler. HandlerNameVariable = "DockerWorkerConfigVars" - - // DockerVariableName is the Docker config patch variable name. - DockerVariableName = "docker" ) func NewVariable() *dockerWorkerConfigVariableHandler { @@ -44,7 +40,7 @@ func (h *dockerWorkerConfigVariableHandler) DiscoverVariables( resp *runtimehooksv1.DiscoverVariablesResponse, ) { resp.Variables = append(resp.Variables, clusterv1.ClusterClassVariable{ - Name: workerconfig.MetaVariableName, + Name: v1alpha1.WorkerConfigVariableName, Required: false, Schema: v1alpha1.DockerNodeConfig{}.VariableSchema(), }) diff --git a/pkg/handlers/docker/workerconfig/variables_test.go b/pkg/handlers/docker/workerconfig/variables_test.go index 78a20c8b9..cd13881c2 100644 --- a/pkg/handlers/docker/workerconfig/variables_test.go +++ b/pkg/handlers/docker/workerconfig/variables_test.go @@ -10,13 +10,12 @@ 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/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, ptr.To(v1alpha1.DockerNodeConfig{}.VariableSchema()), false, NewVariable, diff --git a/pkg/handlers/generic/clusterconfig/variables.go b/pkg/handlers/generic/clusterconfig/variables.go index d995b78b1..0dd5fea54 100644 --- a/pkg/handlers/generic/clusterconfig/variables.go +++ b/pkg/handlers/generic/clusterconfig/variables.go @@ -13,12 +13,6 @@ import ( ) const ( - // MetaVariableName is the meta cluster config patch variable name. - MetaVariableName = "clusterConfig" - - // MetaControlPlaneConfigName is the meta control-plane config patch variable name. - MetaControlPlaneConfigName = "controlPlane" - // HandlerNameVariable is the name of the variable handler. HandlerNameVariable = "GenericClusterConfigVars" ) @@ -39,7 +33,7 @@ func (h *genericClusterConfigVariableHandler) DiscoverVariables( resp *runtimehooksv1.DiscoverVariablesResponse, ) { resp.Variables = append(resp.Variables, clusterv1.ClusterClassVariable{ - Name: MetaVariableName, + Name: v1alpha1.ClusterConfigVariableName, Required: true, Schema: v1alpha1.GenericClusterConfig{}.VariableSchema(), }) diff --git a/pkg/handlers/generic/lifecycle/ccm/aws/handler.go b/pkg/handlers/generic/lifecycle/ccm/aws/handler.go index f090f3979..aa921631f 100644 --- a/pkg/handlers/generic/lifecycle/ccm/aws/handler.go +++ b/pkg/handlers/generic/lifecycle/ccm/aws/handler.go @@ -15,8 +15,8 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" + apivariables "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/variables" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/k8s/client" - commonclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/common/clusterconfig" lifecycleutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/utils" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options" ) @@ -58,7 +58,7 @@ func New( func (a *AWSCCM) Apply( ctx context.Context, cluster *clusterv1.Cluster, - _ *commonclusterconfig.ClusterConfig, + _ *apivariables.ClusterConfigSpec, log logr.Logger, ) error { log.Info("Creating AWS CCM ConfigMap for Cluster") diff --git a/pkg/handlers/generic/lifecycle/ccm/handler.go b/pkg/handlers/generic/lifecycle/ccm/handler.go index 6a94b4ddc..a6b1738eb 100644 --- a/pkg/handlers/generic/lifecycle/ccm/handler.go +++ b/pkg/handlers/generic/lifecycle/ccm/handler.go @@ -15,11 +15,10 @@ import ( ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" "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" 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" - commonclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/common/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) const ( @@ -30,7 +29,7 @@ type CCMProvider interface { Apply( context.Context, *clusterv1.Cluster, - *commonclusterconfig.ClusterConfig, + *apivariables.ClusterConfigSpec, logr.Logger, ) error } @@ -53,7 +52,7 @@ func New( ) *CCMHandler { return &CCMHandler{ client: c, - variableName: clusterconfig.MetaVariableName, + variableName: v1alpha1.ClusterConfigVariableName, variablePath: []string{"addons", variableRootName}, ProviderHandler: handlers, } @@ -96,9 +95,9 @@ func (c *CCMHandler) AfterControlPlaneInitialized( return } - clusterConfigVar, err := variables.Get[commonclusterconfig.ClusterConfig]( + clusterConfigVar, err := variables.Get[apivariables.ClusterConfigSpec]( varMap, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ) if err != nil { log.Error( diff --git a/pkg/handlers/generic/lifecycle/ccm/nutanix/handler.go b/pkg/handlers/generic/lifecycle/ccm/nutanix/handler.go index 95f2e0206..0c076061e 100644 --- a/pkg/handlers/generic/lifecycle/ccm/nutanix/handler.go +++ b/pkg/handlers/generic/lifecycle/ccm/nutanix/handler.go @@ -18,8 +18,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" caaphv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/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/common/pkg/k8s/client" - commonclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/common/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/config" lifecycleutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/utils" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options" @@ -72,7 +72,7 @@ func New( func (p *provider) Apply( ctx context.Context, cluster *clusterv1.Cluster, - clusterConfig *commonclusterconfig.ClusterConfig, + clusterConfig *apivariables.ClusterConfigSpec, log logr.Logger, ) error { // No need to check for nil values in the struct, this function will only be called if CCM is not nil @@ -164,7 +164,7 @@ func (p *provider) Apply( return nil } -func templateValues(clusterConfig *commonclusterconfig.ClusterConfig, text string) (string, error) { +func templateValues(clusterConfig *apivariables.ClusterConfigSpec, text string) (string, error) { helmValuesTemplate, err := template.New("").Parse(text) if err != nil { return "", fmt.Errorf("failed to parse Helm values template: %w", err) diff --git a/pkg/handlers/generic/lifecycle/ccm/nutanix/handler_test.go b/pkg/handlers/generic/lifecycle/ccm/nutanix/handler_test.go index aac4a60b1..2a02f74a1 100644 --- a/pkg/handlers/generic/lifecycle/ccm/nutanix/handler_test.go +++ b/pkg/handlers/generic/lifecycle/ccm/nutanix/handler_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" - commonclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/common/clusterconfig" + apivariables "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/variables" ) const ( @@ -59,14 +59,14 @@ func Test_templateValues(t *testing.T) { tests := []struct { name string - clusterConfig *commonclusterconfig.ClusterConfig + clusterConfig *apivariables.ClusterConfigSpec in string expected string }{ { name: "With AdditionalTrustBundle set", - clusterConfig: &commonclusterconfig.ClusterConfig{ + clusterConfig: &apivariables.ClusterConfigSpec{ GenericClusterConfigSpec: v1alpha1.GenericClusterConfigSpec{ Addons: &v1alpha1.Addons{ CCM: &v1alpha1.CCM{ @@ -93,7 +93,7 @@ func Test_templateValues(t *testing.T) { }, { name: "Without an AdditionalTrustBundle set", - clusterConfig: &commonclusterconfig.ClusterConfig{ + clusterConfig: &apivariables.ClusterConfigSpec{ GenericClusterConfigSpec: v1alpha1.GenericClusterConfigSpec{ Addons: &v1alpha1.Addons{ CCM: &v1alpha1.CCM{ diff --git a/pkg/handlers/generic/lifecycle/clusterautoscaler/handler.go b/pkg/handlers/generic/lifecycle/clusterautoscaler/handler.go index 2dd550065..66a4cf9b5 100644 --- a/pkg/handlers/generic/lifecycle/clusterautoscaler/handler.go +++ b/pkg/handlers/generic/lifecycle/clusterautoscaler/handler.go @@ -17,7 +17,6 @@ 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/clusterconfig" "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/options" ) @@ -66,7 +65,7 @@ func New( client: c, config: cfg, helmChartInfoGetter: helmChartInfoGetter, - variableName: clusterconfig.MetaVariableName, + variableName: v1alpha1.ClusterConfigVariableName, variablePath: []string{"addons", v1alpha1.ClusterAutoscalerVariableName}, } } diff --git a/pkg/handlers/generic/lifecycle/clusterautoscaler/variables_test.go b/pkg/handlers/generic/lifecycle/clusterautoscaler/variables_test.go index 9557adda6..d5f0e58e7 100644 --- a/pkg/handlers/generic/lifecycle/clusterautoscaler/variables_test.go +++ b/pkg/handlers/generic/lifecycle/clusterautoscaler/variables_test.go @@ -12,14 +12,13 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) func TestVariableValidation_AWS(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, @@ -60,7 +59,7 @@ func TestVariableValidation_AWS(t *testing.T) { func TestVariableValidation_Nutanix(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, @@ -101,7 +100,7 @@ func TestVariableValidation_Nutanix(t *testing.T) { func TestVariableValidation_Docker(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.DockerClusterConfig{}.VariableSchema()), true, dockerclusterconfig.NewVariable, diff --git a/pkg/handlers/generic/lifecycle/cni/calico/handler.go b/pkg/handlers/generic/lifecycle/cni/calico/handler.go index 00dea4e06..b297def49 100644 --- a/pkg/handlers/generic/lifecycle/cni/calico/handler.go +++ b/pkg/handlers/generic/lifecycle/cni/calico/handler.go @@ -17,7 +17,6 @@ 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/clusterconfig" "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/options" ) @@ -66,7 +65,7 @@ func New( client: c, config: cfg, helmChartInfoGetter: helmChartInfoGetter, - variableName: clusterconfig.MetaVariableName, + variableName: v1alpha1.ClusterConfigVariableName, variablePath: []string{"addons", v1alpha1.CNIVariableName}, } } diff --git a/pkg/handlers/generic/lifecycle/cni/cilium/handler.go b/pkg/handlers/generic/lifecycle/cni/cilium/handler.go index ac41d982a..4121456ea 100644 --- a/pkg/handlers/generic/lifecycle/cni/cilium/handler.go +++ b/pkg/handlers/generic/lifecycle/cni/cilium/handler.go @@ -17,7 +17,6 @@ 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/clusterconfig" "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/options" ) @@ -66,7 +65,7 @@ func New( client: c, config: cfg, helmChartInfoGetter: helmChartInfoGetter, - variableName: clusterconfig.MetaVariableName, + variableName: v1alpha1.ClusterConfigVariableName, variablePath: []string{"addons", v1alpha1.CNIVariableName}, } } diff --git a/pkg/handlers/generic/lifecycle/cni/variables_test.go b/pkg/handlers/generic/lifecycle/cni/variables_test.go index 91f88f7d2..a65045944 100644 --- a/pkg/handlers/generic/lifecycle/cni/variables_test.go +++ b/pkg/handlers/generic/lifecycle/cni/variables_test.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) @@ -63,7 +62,7 @@ var testDefs = []capitest.VariableTestDef{{ func TestVariableValidation_AWS(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, @@ -74,7 +73,7 @@ func TestVariableValidation_AWS(t *testing.T) { func TestVariableValidation_Docker(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.DockerClusterConfig{}.VariableSchema()), true, dockerclusterconfig.NewVariable, @@ -85,7 +84,7 @@ func TestVariableValidation_Docker(t *testing.T) { func TestVariableValidation_Nutanix(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, diff --git a/pkg/handlers/generic/lifecycle/csi/handler.go b/pkg/handlers/generic/lifecycle/csi/handler.go index e32711d19..8670e78c3 100644 --- a/pkg/handlers/generic/lifecycle/csi/handler.go +++ b/pkg/handlers/generic/lifecycle/csi/handler.go @@ -16,7 +16,6 @@ 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/clusterconfig" ) const ( @@ -51,7 +50,7 @@ func New( ) *CSIHandler { return &CSIHandler{ client: c, - variableName: clusterconfig.MetaVariableName, + variableName: v1alpha1.ClusterConfigVariableName, variablePath: []string{"addons", variableRootName}, ProviderHandler: handlers, } diff --git a/pkg/handlers/generic/lifecycle/csi/handler_test.go b/pkg/handlers/generic/lifecycle/csi/handler_test.go index 313c58d25..537bb9ce6 100644 --- a/pkg/handlers/generic/lifecycle/csi/handler_test.go +++ b/pkg/handlers/generic/lifecycle/csi/handler_test.go @@ -15,7 +15,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "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/variables" + apivariables "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/variables" ) type fakeCSIProvider struct { @@ -41,7 +41,7 @@ var testProviderHandlers = map[string]CSIProvider{ } func testReq(csi *v1alpha1.CSI) (*runtimehooksv1.AfterControlPlaneInitializedRequest, error) { - cv, err := variables.MarshalToClusterVariable( + cv, err := apivariables.MarshalToClusterVariable( "clusterConfig", &v1alpha1.GenericClusterConfigSpec{ Addons: &v1alpha1.Addons{ diff --git a/pkg/handlers/generic/lifecycle/nfd/handler.go b/pkg/handlers/generic/lifecycle/nfd/handler.go index 6a829649d..aed4ea898 100644 --- a/pkg/handlers/generic/lifecycle/nfd/handler.go +++ b/pkg/handlers/generic/lifecycle/nfd/handler.go @@ -17,7 +17,6 @@ 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/clusterconfig" "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/options" ) @@ -66,7 +65,7 @@ func New( client: c, config: cfg, helmChartInfoGetter: helmChartInfoGetter, - variableName: clusterconfig.MetaVariableName, + variableName: v1alpha1.ClusterConfigVariableName, variablePath: []string{"addons", v1alpha1.NFDVariableName}, } } diff --git a/pkg/handlers/generic/lifecycle/nfd/variables_test.go b/pkg/handlers/generic/lifecycle/nfd/variables_test.go index 7000a6b5f..a4d65593e 100644 --- a/pkg/handlers/generic/lifecycle/nfd/variables_test.go +++ b/pkg/handlers/generic/lifecycle/nfd/variables_test.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) @@ -49,7 +48,7 @@ var testDefs = []capitest.VariableTestDef{{ func TestVariableValidation_AWS(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, @@ -60,7 +59,7 @@ func TestVariableValidation_AWS(t *testing.T) { func TestVariableValidation_Docker(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.DockerClusterConfig{}.VariableSchema()), true, dockerclusterconfig.NewVariable, @@ -71,7 +70,7 @@ func TestVariableValidation_Docker(t *testing.T) { func TestVariableValidation_Nutanix(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, diff --git a/pkg/handlers/generic/lifecycle/serviceloadbalancer/handler.go b/pkg/handlers/generic/lifecycle/serviceloadbalancer/handler.go index c404c0669..c528ceb68 100644 --- a/pkg/handlers/generic/lifecycle/serviceloadbalancer/handler.go +++ b/pkg/handlers/generic/lifecycle/serviceloadbalancer/handler.go @@ -17,7 +17,6 @@ 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/clusterconfig" ) type ServiceLoadBalancerProvider interface { @@ -46,7 +45,7 @@ func New( ) *ServiceLoadBalancerHandler { return &ServiceLoadBalancerHandler{ client: c, - variableName: clusterconfig.MetaVariableName, + variableName: v1alpha1.ClusterConfigVariableName, variablePath: []string{"addons", v1alpha1.ServiceLoadBalancerVariableName}, ProviderHandler: handlers, } diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go b/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go index 71981c194..787fea10a 100644 --- a/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go +++ b/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go @@ -21,7 +21,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" virtuialipproviders "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/options" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" @@ -43,7 +42,7 @@ var _ = Describe("Generate ControlPlane virtual IP patches", func() { Name: "host and port should be templated in a new file and no pre/post commands", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.ControlPlaneEndpointSpec{ Host: "10.20.100.10", Port: 6443, @@ -114,7 +113,7 @@ var _ = Describe("Generate ControlPlane virtual IP patches", func() { Name: "host and port should be templated in a new file with pre/post commands", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.ControlPlaneEndpointSpec{ Host: "10.20.100.10", Port: 6443, @@ -232,7 +231,7 @@ var _ = Describe("Generate ControlPlane virtual IP patches", func() { return mutation.NewMetaGeneratePatchesHandler( "", client, - NewControlPlaneVirtualIP(client, cfg, clusterconfig.MetaVariableName, VariableName), + NewControlPlaneVirtualIP(client, cfg, v1alpha1.ClusterConfigVariableName, VariableName), ).(mutation.GeneratePatches) } diff --git a/pkg/handlers/generic/mutation/encryptionatrest/encryptionprovider_test.go b/pkg/handlers/generic/mutation/encryptionatrest/encryptionprovider_test.go index 2d5617176..f24967443 100644 --- a/pkg/handlers/generic/mutation/encryptionatrest/encryptionprovider_test.go +++ b/pkg/handlers/generic/mutation/encryptionatrest/encryptionprovider_test.go @@ -10,21 +10,21 @@ import ( "github.com/stretchr/testify/assert" apiserverv1 "k8s.io/apiserver/pkg/apis/config/v1" - carenv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" ) func Test_encryptionConfigForSecretsAndConfigMaps(t *testing.T) { testcases := []struct { name string - providers *carenv1.EncryptionProviders + providers *v1alpha1.EncryptionProviders wantErr error want *apiserverv1.ResourceConfiguration }{ { name: "encryption configuration using all providers", - providers: &carenv1.EncryptionProviders{ - AESCBC: &carenv1.AESConfiguration{}, - Secretbox: &carenv1.SecretboxConfiguration{}, + providers: &v1alpha1.EncryptionProviders{ + AESCBC: &v1alpha1.AESConfiguration{}, + Secretbox: &v1alpha1.SecretboxConfiguration{}, }, wantErr: nil, want: &apiserverv1.ResourceConfiguration{ @@ -53,8 +53,8 @@ func Test_encryptionConfigForSecretsAndConfigMaps(t *testing.T) { }, { name: "encryption configuration using single provider", - providers: &carenv1.EncryptionProviders{ - AESCBC: &carenv1.AESConfiguration{}, + providers: &v1alpha1.EncryptionProviders{ + AESCBC: &v1alpha1.AESConfiguration{}, }, wantErr: nil, want: &apiserverv1.ResourceConfiguration{ diff --git a/pkg/handlers/generic/mutation/encryptionatrest/inject.go b/pkg/handlers/generic/mutation/encryptionatrest/inject.go index 912fedb1f..528808b71 100644 --- a/pkg/handlers/generic/mutation/encryptionatrest/inject.go +++ b/pkg/handlers/generic/mutation/encryptionatrest/inject.go @@ -24,14 +24,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/yaml" - carenv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + "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/mutation" "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/common/pkg/capi/utils" k8sClientUtil "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/clusterconfig" ) const ( @@ -54,7 +53,7 @@ func NewPatch(client ctrlclient.Client, keyGenerator TokenGenerator) *encryption return &encryptionPatchHandler{ client: client, keyGenerator: keyGenerator, - variableName: clusterconfig.MetaVariableName, + variableName: v1alpha1.ClusterConfigVariableName, variableFieldPath: []string{VariableName}, } } @@ -69,7 +68,7 @@ func (h *encryptionPatchHandler) Mutate( ) error { log := ctrl.LoggerFrom(ctx, "holderRef", holderRef) - encryptionVariable, err := variables.Get[carenv1.EncryptionAtRest]( + encryptionVariable, err := variables.Get[v1alpha1.EncryptionAtRest]( vars, h.variableName, h.variableFieldPath..., @@ -160,7 +159,7 @@ func generateEncryptionCredentialsFile(cluster *clusterv1.Cluster) cabpkv1.File } func (h *encryptionPatchHandler) generateEncryptionConfiguration( - providers []carenv1.EncryptionProviders, + providers []v1alpha1.EncryptionProviders, ) (*apiserverv1.EncryptionConfiguration, error) { resourceConfigs := []apiserverv1.ResourceConfiguration{} for _, encProvider := range providers { @@ -254,7 +253,7 @@ func (h *encryptionPatchHandler) createEncryptionConfigurationSecret( // We only support encryption for "secrets" and "configmaps". func defaultEncryptionConfiguration( - providers *carenv1.EncryptionProviders, + providers *v1alpha1.EncryptionProviders, secretGenerator TokenGenerator, ) (*apiserverv1.ResourceConfiguration, error) { providerConfig := apiserverv1.ProviderConfiguration{} diff --git a/pkg/handlers/generic/mutation/encryptionatrest/inject_test.go b/pkg/handlers/generic/mutation/encryptionatrest/inject_test.go index 89e0eb63b..522dd71b3 100644 --- a/pkg/handlers/generic/mutation/encryptionatrest/inject_test.go +++ b/pkg/handlers/generic/mutation/encryptionatrest/inject_test.go @@ -19,11 +19,10 @@ import ( runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - carenv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + "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/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -67,11 +66,11 @@ var _ = Describe("Generate Encryption configuration patches", func() { encryptionVar := []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, - carenv1.EncryptionAtRest{ - Providers: []carenv1.EncryptionProviders{ + v1alpha1.ClusterConfigVariableName, + v1alpha1.EncryptionAtRest{ + Providers: []v1alpha1.EncryptionProviders{ { - AESCBC: &carenv1.AESConfiguration{}, + AESCBC: &v1alpha1.AESConfiguration{}, }, }, }, diff --git a/pkg/handlers/generic/mutation/etcd/inject.go b/pkg/handlers/generic/mutation/etcd/inject.go index 12b315726..111d23da8 100644 --- a/pkg/handlers/generic/mutation/etcd/inject.go +++ b/pkg/handlers/generic/mutation/etcd/inject.go @@ -19,7 +19,6 @@ 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/clusterconfig" ) const ( @@ -33,7 +32,7 @@ type etcdPatchHandler struct { } func NewPatch() *etcdPatchHandler { - return newEtcdPatchHandler(clusterconfig.MetaVariableName, VariableName) + return newEtcdPatchHandler(v1alpha1.ClusterConfigVariableName, VariableName) } func newEtcdPatchHandler( diff --git a/pkg/handlers/generic/mutation/etcd/inject_test.go b/pkg/handlers/generic/mutation/etcd/inject_test.go index 29d337fc6..c460f9aef 100644 --- a/pkg/handlers/generic/mutation/etcd/inject_test.go +++ b/pkg/handlers/generic/mutation/etcd/inject_test.go @@ -14,7 +14,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -36,7 +35,7 @@ var _ = Describe("Generate etcd patches", func() { Name: "etcd imageRepository and imageTag set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.Etcd{ Image: &v1alpha1.Image{ Repository: "my-registry.io/my-org/my-repo", @@ -67,7 +66,7 @@ var _ = Describe("Generate etcd patches", func() { Name: "etcd imageRepository set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.Etcd{ Image: &v1alpha1.Image{ Repository: "my-registry.io/my-org/my-repo", @@ -96,7 +95,7 @@ var _ = Describe("Generate etcd patches", func() { Name: "etcd imageTag set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.Etcd{ Image: &v1alpha1.Image{ Tag: "v3.5.99_custom.0", diff --git a/pkg/handlers/generic/mutation/etcd/variables_test.go b/pkg/handlers/generic/mutation/etcd/variables_test.go index f1cd08c42..206882aec 100644 --- a/pkg/handlers/generic/mutation/etcd/variables_test.go +++ b/pkg/handlers/generic/mutation/etcd/variables_test.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) @@ -56,7 +55,7 @@ var testDefs = []capitest.VariableTestDef{{ func TestVariableValidation_AWS(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, @@ -67,7 +66,7 @@ func TestVariableValidation_AWS(t *testing.T) { func TestVariableValidation_Docker(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.DockerClusterConfig{}.VariableSchema()), true, dockerclusterconfig.NewVariable, @@ -78,7 +77,7 @@ func TestVariableValidation_Docker(t *testing.T) { func TestVariableValidation_Nutanix(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, diff --git a/pkg/handlers/generic/mutation/extraapiservercertsans/inject.go b/pkg/handlers/generic/mutation/extraapiservercertsans/inject.go index 380475b37..8f2bb9a1f 100644 --- a/pkg/handlers/generic/mutation/extraapiservercertsans/inject.go +++ b/pkg/handlers/generic/mutation/extraapiservercertsans/inject.go @@ -22,7 +22,6 @@ import ( "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/common/pkg/capi/utils" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) const ( @@ -36,7 +35,7 @@ type extraAPIServerCertSANsPatchHandler struct { } func NewPatch() *extraAPIServerCertSANsPatchHandler { - return newExtraAPIServerCertSANsPatchHandler(clusterconfig.MetaVariableName, VariableName) + return newExtraAPIServerCertSANsPatchHandler(v1alpha1.ClusterConfigVariableName, VariableName) } func newExtraAPIServerCertSANsPatchHandler( diff --git a/pkg/handlers/generic/mutation/extraapiservercertsans/inject_test.go b/pkg/handlers/generic/mutation/extraapiservercertsans/inject_test.go index 68eb8e52c..7e784ce45 100644 --- a/pkg/handlers/generic/mutation/extraapiservercertsans/inject_test.go +++ b/pkg/handlers/generic/mutation/extraapiservercertsans/inject_test.go @@ -20,7 +20,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -50,7 +49,7 @@ var _ = Describe("Generate Extra API server certificate patches", func() { Name: "extra API server cert SANs set with AWS", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.AWSClusterConfigSpec{ ExtraAPIServerCertSANs: []string{ "a.b.c.example.com", @@ -89,7 +88,7 @@ var _ = Describe("Generate Extra API server certificate patches", func() { Name: "extra API server cert SANs set with Docker", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.DockerClusterConfigSpec{ ExtraAPIServerCertSANs: []string{ "a.b.c.example.com", @@ -131,7 +130,7 @@ var _ = Describe("Generate Extra API server certificate patches", func() { Name: "extra API server cert SANs set with Nutanix", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.NutanixClusterConfigSpec{ ExtraAPIServerCertSANs: []string{ "a.b.c.example.com", diff --git a/pkg/handlers/generic/mutation/extraapiservercertsans/variables_test.go b/pkg/handlers/generic/mutation/extraapiservercertsans/variables_test.go index b998db8e9..1943b6f58 100644 --- a/pkg/handlers/generic/mutation/extraapiservercertsans/variables_test.go +++ b/pkg/handlers/generic/mutation/extraapiservercertsans/variables_test.go @@ -12,14 +12,13 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) func TestVariableValidation_AWS(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, @@ -50,7 +49,7 @@ func TestVariableValidation_AWS(t *testing.T) { func TestVariableValidation_Docker(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.DockerClusterConfig{}.VariableSchema()), true, dockerclusterconfig.NewVariable, @@ -81,7 +80,7 @@ func TestVariableValidation_Docker(t *testing.T) { func TestVariableValidation_Nutanix(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, diff --git a/pkg/handlers/generic/mutation/httpproxy/inject.go b/pkg/handlers/generic/mutation/httpproxy/inject.go index 3e0ffd155..49134b81d 100644 --- a/pkg/handlers/generic/mutation/httpproxy/inject.go +++ b/pkg/handlers/generic/mutation/httpproxy/inject.go @@ -19,7 +19,6 @@ 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/clusterconfig" ) const ( @@ -37,7 +36,7 @@ type httpProxyPatchHandler struct { func NewPatch( cl ctrlclient.Reader, ) *httpProxyPatchHandler { - return newHTTPProxyPatchHandler(cl, clusterconfig.MetaVariableName, VariableName) + return newHTTPProxyPatchHandler(cl, v1alpha1.ClusterConfigVariableName, VariableName) } func newHTTPProxyPatchHandler( diff --git a/pkg/handlers/generic/mutation/httpproxy/inject_test.go b/pkg/handlers/generic/mutation/httpproxy/inject_test.go index 67eb5d18f..7229308d9 100644 --- a/pkg/handlers/generic/mutation/httpproxy/inject_test.go +++ b/pkg/handlers/generic/mutation/httpproxy/inject_test.go @@ -21,7 +21,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -54,7 +53,7 @@ var _ = Describe("Generate HTTPProxy Patches", func() { Name: "http proxy set for KubeadmConfigTemplate generic worker", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.HTTPProxy{ HTTP: "http://example.com", HTTPS: "https://example.com", @@ -89,7 +88,7 @@ var _ = Describe("Generate HTTPProxy Patches", func() { Name: "http proxy set for KubeadmControlPlaneTemplate", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.HTTPProxy{ HTTP: "http://example.com", HTTPS: "https://example.com", diff --git a/pkg/handlers/generic/mutation/httpproxy/variables_test.go b/pkg/handlers/generic/mutation/httpproxy/variables_test.go index bd4acc68d..55227da56 100644 --- a/pkg/handlers/generic/mutation/httpproxy/variables_test.go +++ b/pkg/handlers/generic/mutation/httpproxy/variables_test.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) @@ -30,7 +29,7 @@ var testDefs = []capitest.VariableTestDef{{ func TestVariableValidation_AWS(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, @@ -41,7 +40,7 @@ func TestVariableValidation_AWS(t *testing.T) { func TestVariableValidation_Docker(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.DockerClusterConfig{}.VariableSchema()), true, dockerclusterconfig.NewVariable, @@ -52,7 +51,7 @@ func TestVariableValidation_Docker(t *testing.T) { func TestVariableValidation_Nutanix(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/inject.go b/pkg/handlers/generic/mutation/imageregistries/credentials/inject.go index 2e9b49ad8..07010477f 100644 --- a/pkg/handlers/generic/mutation/imageregistries/credentials/inject.go +++ b/pkg/handlers/generic/mutation/imageregistries/credentials/inject.go @@ -26,7 +26,6 @@ import ( "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/common/pkg/k8s/client" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/imageregistries" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/mirrors" ) @@ -45,7 +44,7 @@ func NewPatch( ) *imageRegistriesPatchHandler { return newImageRegistriesPatchHandler( cl, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, imageregistries.VariableName, ) } diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go b/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go index af70741b9..6cbdaf85e 100644 --- a/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go +++ b/pkg/handlers/generic/mutation/imageregistries/credentials/inject_test.go @@ -22,7 +22,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/imageregistries" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -149,7 +148,7 @@ var _ = Describe("Generate Image registry patches", func() { Name: "files added in KubeadmControlPlaneTemplate for ECR without a Secret", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, []v1alpha1.ImageRegistry{{ URL: "https://123456789.dkr.ecr.us-east-1.amazonaws.com", }}, @@ -202,7 +201,7 @@ var _ = Describe("Generate Image registry patches", func() { Name: "files added in KubeadmControlPlaneTemplate for registry with a Secret", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, []v1alpha1.ImageRegistry{{ URL: "https://registry.example.com", Credentials: &v1alpha1.RegistryCredentials{ @@ -266,7 +265,7 @@ var _ = Describe("Generate Image registry patches", func() { Name: "files added in KubeadmConfigTemplate for ECR without a Secret", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, []v1alpha1.ImageRegistry{{ URL: "https://123456789.dkr.ecr.us-east-1.amazonaws.com", }}, @@ -319,7 +318,7 @@ var _ = Describe("Generate Image registry patches", func() { Name: "files added in KubeadmConfigTemplate for registry with a Secret", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, []v1alpha1.ImageRegistry{{ URL: "https://registry.example.com", Credentials: &v1alpha1.RegistryCredentials{ @@ -380,7 +379,7 @@ var _ = Describe("Generate Image registry patches", func() { Name: "error for a registry with no credentials", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, []v1alpha1.ImageRegistry{{ URL: "https://registry.example.com", }}, diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/variables_test.go b/pkg/handlers/generic/mutation/imageregistries/credentials/variables_test.go index 68787473a..6942b0ac6 100644 --- a/pkg/handlers/generic/mutation/imageregistries/credentials/variables_test.go +++ b/pkg/handlers/generic/mutation/imageregistries/credentials/variables_test.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) @@ -78,7 +77,7 @@ var testDefs = []capitest.VariableTestDef{ func TestVariableValidation_AWS(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, @@ -89,7 +88,7 @@ func TestVariableValidation_AWS(t *testing.T) { func TestVariableValidation_Docker(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.DockerClusterConfig{}.VariableSchema()), true, dockerclusterconfig.NewVariable, @@ -100,7 +99,7 @@ func TestVariableValidation_Docker(t *testing.T) { func TestVariableValidation_Nutanix(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, diff --git a/pkg/handlers/generic/mutation/kubernetesimagerepository/inject.go b/pkg/handlers/generic/mutation/kubernetesimagerepository/inject.go index f881eb2dc..8a390b080 100644 --- a/pkg/handlers/generic/mutation/kubernetesimagerepository/inject.go +++ b/pkg/handlers/generic/mutation/kubernetesimagerepository/inject.go @@ -14,11 +14,11 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "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/common/pkg/capi/clustertopology/handlers/mutation" "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/clusterconfig" ) const ( @@ -32,7 +32,7 @@ type imageRepositoryPatchHandler struct { } func NewPatch() *imageRepositoryPatchHandler { - return newImageRepositoryPatchHandler(clusterconfig.MetaVariableName, VariableName) + return newImageRepositoryPatchHandler(v1alpha1.ClusterConfigVariableName, VariableName) } func newImageRepositoryPatchHandler( diff --git a/pkg/handlers/generic/mutation/kubernetesimagerepository/inject_test.go b/pkg/handlers/generic/mutation/kubernetesimagerepository/inject_test.go index c58211e84..36656bc0e 100644 --- a/pkg/handlers/generic/mutation/kubernetesimagerepository/inject_test.go +++ b/pkg/handlers/generic/mutation/kubernetesimagerepository/inject_test.go @@ -10,10 +10,10 @@ import ( "github.com/onsi/gomega" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" + "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/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -35,7 +35,7 @@ var _ = Describe("Generate Kubernetes Image Repository patches", func() { Name: "kubernetesImageRepository set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, "my-registry.io/my-org/my-repo", VariableName, ), diff --git a/pkg/handlers/generic/mutation/kubernetesimagerepository/variables_test.go b/pkg/handlers/generic/mutation/kubernetesimagerepository/variables_test.go index b7b78d041..46433ffba 100644 --- a/pkg/handlers/generic/mutation/kubernetesimagerepository/variables_test.go +++ b/pkg/handlers/generic/mutation/kubernetesimagerepository/variables_test.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) @@ -28,7 +27,7 @@ var testDefs = []capitest.VariableTestDef{{ func TestVariableValidation_AWS(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, @@ -39,7 +38,7 @@ func TestVariableValidation_AWS(t *testing.T) { func TestVariableValidation_Docker(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.DockerClusterConfig{}.VariableSchema()), true, dockerclusterconfig.NewVariable, @@ -50,7 +49,7 @@ func TestVariableValidation_Docker(t *testing.T) { func TestVariableValidation_Nutanix(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, diff --git a/pkg/handlers/generic/mutation/mirrors/inject.go b/pkg/handlers/generic/mutation/mirrors/inject.go index 9457913e3..517e66817 100644 --- a/pkg/handlers/generic/mutation/mirrors/inject.go +++ b/pkg/handlers/generic/mutation/mirrors/inject.go @@ -20,7 +20,6 @@ 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/clusterconfig" ) type globalMirrorPatchHandler struct { @@ -35,7 +34,7 @@ func NewPatch( ) *globalMirrorPatchHandler { return newGlobalMirrorPatchHandler( cl, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, GlobalMirrorVariableName, ) } diff --git a/pkg/handlers/generic/mutation/mirrors/inject_test.go b/pkg/handlers/generic/mutation/mirrors/inject_test.go index 7e5a02f04..e4decf69c 100644 --- a/pkg/handlers/generic/mutation/mirrors/inject_test.go +++ b/pkg/handlers/generic/mutation/mirrors/inject_test.go @@ -17,7 +17,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -53,7 +52,7 @@ var _ = Describe("Generate Global mirror patches", func() { Name: "files added in KubeadmControlPlaneTemplate for registry with mirror without CA Certificate", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.GlobalImageRegistryMirror{ URL: "https://123456789.dkr.ecr.us-east-1.amazonaws.com", }, @@ -80,7 +79,7 @@ var _ = Describe("Generate Global mirror patches", func() { Name: "files added in KubeadmControlPlaneTemplate for registry with mirror with CA Certificate", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.GlobalImageRegistryMirror{ URL: "https://registry.example.com", Credentials: &v1alpha1.RegistryCredentials{ @@ -115,7 +114,7 @@ var _ = Describe("Generate Global mirror patches", func() { Name: "files added in KubeadmConfigTemplate for registry mirror wihthout CA certificate", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.GlobalImageRegistryMirror{ URL: "https://123456789.dkr.ecr.us-east-1.amazonaws.com", }, @@ -150,7 +149,7 @@ var _ = Describe("Generate Global mirror patches", func() { Name: "files added in KubeadmConfigTemplate for registry mirror with secret for CA certificate", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.GlobalImageRegistryMirror{ URL: "https://registry.example.com", Credentials: &v1alpha1.RegistryCredentials{ diff --git a/pkg/handlers/generic/mutation/mirrors/variables_test.go b/pkg/handlers/generic/mutation/mirrors/variables_test.go index 875ebe541..d25235fd8 100644 --- a/pkg/handlers/generic/mutation/mirrors/variables_test.go +++ b/pkg/handlers/generic/mutation/mirrors/variables_test.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) @@ -56,7 +55,7 @@ var testDefs = []capitest.VariableTestDef{{ func TestVariableValidation_AWS(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, @@ -67,7 +66,7 @@ func TestVariableValidation_AWS(t *testing.T) { func TestVariableValidation_Docker(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.DockerClusterConfig{}.VariableSchema()), true, dockerclusterconfig.NewVariable, @@ -78,7 +77,7 @@ func TestVariableValidation_Docker(t *testing.T) { func TestVariableValidation_Nutanix(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, diff --git a/pkg/handlers/generic/mutation/users/inject.go b/pkg/handlers/generic/mutation/users/inject.go index 381695c0a..bd9e2d9a8 100644 --- a/pkg/handlers/generic/mutation/users/inject.go +++ b/pkg/handlers/generic/mutation/users/inject.go @@ -20,7 +20,6 @@ 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/clusterconfig" ) const ( @@ -35,7 +34,7 @@ type usersPatchHandler struct { func NewPatch() *usersPatchHandler { return newUsersPatchHandler( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, VariableName) } diff --git a/pkg/handlers/generic/mutation/users/inject_test.go b/pkg/handlers/generic/mutation/users/inject_test.go index 7c7f19761..3c3fd5669 100644 --- a/pkg/handlers/generic/mutation/users/inject_test.go +++ b/pkg/handlers/generic/mutation/users/inject_test.go @@ -18,7 +18,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -157,7 +156,7 @@ var _ = Describe("Generate Users patches", func() { Name: "users set for KubeadmControlPlaneTemplate", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, []v1alpha1.User{testUser1, testUser2}, VariableName, ), @@ -173,7 +172,7 @@ var _ = Describe("Generate Users patches", func() { Name: "users set for KubeadmConfigTemplate generic worker", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, []v1alpha1.User{testUser1, testUser2}, VariableName, ), diff --git a/pkg/handlers/generic/mutation/users/variables_test.go b/pkg/handlers/generic/mutation/users/variables_test.go index 280511136..c196f1dc6 100644 --- a/pkg/handlers/generic/mutation/users/variables_test.go +++ b/pkg/handlers/generic/mutation/users/variables_test.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" awsclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/clusterconfig" dockerclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/docker/clusterconfig" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) @@ -39,7 +38,7 @@ var testDefs = []capitest.VariableTestDef{{ func TestVariableValidation_AWS(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.AWSClusterConfig{}.VariableSchema()), true, awsclusterconfig.NewVariable, @@ -50,7 +49,7 @@ func TestVariableValidation_AWS(t *testing.T) { func TestVariableValidation_Docker(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.DockerClusterConfig{}.VariableSchema()), true, dockerclusterconfig.NewVariable, @@ -61,7 +60,7 @@ func TestVariableValidation_Docker(t *testing.T) { func TestVariableValidation_Nutanix(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, diff --git a/pkg/handlers/generic/workerconfig/variables.go b/pkg/handlers/generic/workerconfig/variables.go deleted file mode 100644 index d0cce864b..000000000 --- a/pkg/handlers/generic/workerconfig/variables.go +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2023 Nutanix. All rights reserved. -// SPDX-License-Identifier: Apache-2.0 - -package workerconfig - -const ( - // MetaVariableName is the meta worker config patch variable name. - MetaVariableName = "workerConfig" -) diff --git a/pkg/handlers/nutanix/clusterconfig/variables.go b/pkg/handlers/nutanix/clusterconfig/variables.go index de14f61fc..251ea3147 100644 --- a/pkg/handlers/nutanix/clusterconfig/variables.go +++ b/pkg/handlers/nutanix/clusterconfig/variables.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" 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/mutation" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) var ( @@ -23,9 +22,6 @@ var ( const ( // HandlerNameVariable is the name of the variable handler. HandlerNameVariable = "NutanixClusterConfigVars" - - // NutanixVariableName is the Nutanix config patch variable name. - NutanixVariableName = "nutanix" ) func NewVariable() *nutanixClusterConfigVariableHandler { @@ -44,7 +40,7 @@ func (h *nutanixClusterConfigVariableHandler) DiscoverVariables( resp *runtimehooksv1.DiscoverVariablesResponse, ) { resp.Variables = append(resp.Variables, clusterv1.ClusterClassVariable{ - Name: clusterconfig.MetaVariableName, + Name: v1alpha1.ClusterConfigVariableName, Required: true, Schema: v1alpha1.NutanixClusterConfig{}.VariableSchema(), }) diff --git a/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject.go b/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject.go index c18d8cb2b..95428b189 100644 --- a/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject.go +++ b/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject.go @@ -19,7 +19,6 @@ 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/clusterconfig" ) const ( @@ -34,7 +33,7 @@ type nutanixControlPlaneEndpoint struct { func NewPatch() *nutanixControlPlaneEndpoint { return newNutanixControlPlaneEndpoint( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.NutanixVariableName, VariableName, ) diff --git a/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject_test.go b/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject_test.go index f388be57f..8e5c0d75c 100644 --- a/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject_test.go +++ b/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject_test.go @@ -14,8 +14,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" - nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -37,12 +35,12 @@ var _ = Describe("Generate Nutanix ControlPlane endpoint patches", func() { Name: "ControlPlaneEndpoint set to valid host and port", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.ControlPlaneEndpointSpec{ Host: "10.20.100.10", Port: 6443, }, - nutanixclusterconfig.NutanixVariableName, + v1alpha1.NutanixVariableName, VariableName, ), }, diff --git a/pkg/handlers/nutanix/mutation/controlplaneendpoint/variables_test.go b/pkg/handlers/nutanix/mutation/controlplaneendpoint/variables_test.go index 79c699c4b..e1c2df3a2 100644 --- a/pkg/handlers/nutanix/mutation/controlplaneendpoint/variables_test.go +++ b/pkg/handlers/nutanix/mutation/controlplaneendpoint/variables_test.go @@ -11,7 +11,6 @@ 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/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) @@ -23,7 +22,7 @@ var testPrismCentralURL = fmt.Sprintf( func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, diff --git a/pkg/handlers/nutanix/mutation/controlplanevirtualip/inject.go b/pkg/handlers/nutanix/mutation/controlplanevirtualip/inject.go index 9dc4f1b2d..3e7a8884a 100644 --- a/pkg/handlers/nutanix/mutation/controlplanevirtualip/inject.go +++ b/pkg/handlers/nutanix/mutation/controlplanevirtualip/inject.go @@ -7,7 +7,6 @@ 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/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/controlplanevirtualip" ) @@ -18,7 +17,7 @@ func NewPatch( return controlplanevirtualip.NewControlPlaneVirtualIP( cl, cfg, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.NutanixVariableName, controlplanevirtualip.VariableName, ) diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane.go b/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane.go index 9e49a38e1..f4c53ea0c 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane.go @@ -6,14 +6,13 @@ package machinedetails 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/patches/selectors" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) func NewControlPlanePatch() *nutanixMachineDetailsPatchHandler { return newNutanixMachineDetailsPatchHandler( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, []string{ - clusterconfig.MetaControlPlaneConfigName, + v1alpha1.ControlPlaneConfigVariableName, v1alpha1.NutanixVariableName, VariableName, }, diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane_test.go b/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane_test.go index ea3264bc3..7ce186425 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane_test.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane_test.go @@ -15,8 +15,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" - nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -174,10 +172,10 @@ var _ = Describe("Generate Nutanix Machine Details patches for ControlPlane", fu Name: "all fields set for control-plane", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, variableWithAllFieldsSet, - clusterconfig.MetaControlPlaneConfigName, - nutanixclusterconfig.NutanixVariableName, + v1alpha1.ControlPlaneConfigVariableName, + v1alpha1.NutanixVariableName, VariableName, ), }, diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject_worker.go b/pkg/handlers/nutanix/mutation/machinedetails/inject_worker.go index 06c9ad3e6..9b4af8707 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/inject_worker.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/inject_worker.go @@ -6,12 +6,11 @@ package machinedetails 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/patches/selectors" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) func NewWorkerPatch() *nutanixMachineDetailsPatchHandler { return newNutanixMachineDetailsPatchHandler( - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, []string{ v1alpha1.NutanixVariableName, VariableName, diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go b/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go index 661d0ae9e..7b665157f 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go @@ -8,11 +8,10 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" + "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/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" - nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -29,9 +28,9 @@ var _ = Describe("Generate Nutanix Machine Details patches for Worker", func() { Name: "all fields set for workers", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, variableWithAllFieldsSet, - nutanixclusterconfig.NutanixVariableName, + v1alpha1.NutanixVariableName, VariableName, ), capitest.VariableWithValue( diff --git a/pkg/handlers/nutanix/mutation/machinedetails/variables_test.go b/pkg/handlers/nutanix/mutation/machinedetails/variables_test.go index 7892b8e72..ad85fc9ac 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/variables_test.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/variables_test.go @@ -12,7 +12,6 @@ import ( capxv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/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/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) @@ -59,7 +58,7 @@ func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, diff --git a/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject.go b/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject.go index 34132145e..345c4fae2 100644 --- a/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject.go +++ b/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject.go @@ -22,7 +22,6 @@ 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/clusterconfig" ) const ( @@ -37,7 +36,7 @@ type nutanixPrismCentralEndpoint struct { func NewPatch() *nutanixPrismCentralEndpoint { return newNutanixPrismCentralEndpoint( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.NutanixVariableName, VariableName, ) diff --git a/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject_test.go b/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject_test.go index b37807790..3a2858fab 100644 --- a/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject_test.go +++ b/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject_test.go @@ -14,8 +14,6 @@ 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/common/pkg/testutils/capitest" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" - nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) @@ -41,7 +39,7 @@ var _ = Describe("Generate Nutanix Prism Central Endpoint patches", func() { Name: "all required fields set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.NutanixPrismCentralEndpointSpec{ URL: "https://prism-central.nutanix.com:9441", Insecure: true, @@ -51,7 +49,7 @@ var _ = Describe("Generate Nutanix Prism Central Endpoint patches", func() { }, }, }, - nutanixclusterconfig.NutanixVariableName, + v1alpha1.NutanixVariableName, VariableName, ), }, @@ -77,7 +75,7 @@ var _ = Describe("Generate Nutanix Prism Central Endpoint patches", func() { Name: "all required fields set without port", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.NutanixPrismCentralEndpointSpec{ URL: "https://prism-central.nutanix.com", Insecure: true, @@ -87,7 +85,7 @@ var _ = Describe("Generate Nutanix Prism Central Endpoint patches", func() { }, }, }, - nutanixclusterconfig.NutanixVariableName, + v1alpha1.NutanixVariableName, VariableName, ), }, @@ -116,7 +114,7 @@ var _ = Describe("Generate Nutanix Prism Central Endpoint patches", func() { Name: "additional trust bundle is set", Vars: []runtimehooksv1.Variable{ capitest.VariableWithValue( - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, v1alpha1.NutanixPrismCentralEndpointSpec{ URL: "https://prism-central.nutanix.com:9441", Insecure: true, @@ -127,7 +125,7 @@ var _ = Describe("Generate Nutanix Prism Central Endpoint patches", func() { }, AdditionalTrustBundle: testCertBundle, }, - nutanixclusterconfig.NutanixVariableName, + v1alpha1.NutanixVariableName, VariableName, ), }, diff --git a/pkg/handlers/nutanix/mutation/prismcentralendpoint/variables_test.go b/pkg/handlers/nutanix/mutation/prismcentralendpoint/variables_test.go index 102987686..bcd826778 100644 --- a/pkg/handlers/nutanix/mutation/prismcentralendpoint/variables_test.go +++ b/pkg/handlers/nutanix/mutation/prismcentralendpoint/variables_test.go @@ -11,14 +11,13 @@ 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/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" nutanixclusterconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, ptr.To(v1alpha1.NutanixClusterConfig{}.VariableSchema()), true, nutanixclusterconfig.NewVariable, diff --git a/pkg/handlers/nutanix/workerconfig/variables.go b/pkg/handlers/nutanix/workerconfig/variables.go index 5a0d39f63..b5c194cbe 100644 --- a/pkg/handlers/nutanix/workerconfig/variables.go +++ b/pkg/handlers/nutanix/workerconfig/variables.go @@ -12,7 +12,6 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" 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/mutation" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) var ( @@ -23,9 +22,6 @@ var ( const ( // HandlerNameVariable is the name of the variable handler. HandlerNameVariable = "NutanixWorkerConfigVars" - - // NutanixVariableName is the Nutanix config patch variable name. - NutanixVariableName = "nutanix" ) func NewVariable() *nutanixWorkerConfigVariableHandler { @@ -44,7 +40,7 @@ func (h *nutanixWorkerConfigVariableHandler) DiscoverVariables( resp *runtimehooksv1.DiscoverVariablesResponse, ) { resp.Variables = append(resp.Variables, clusterv1.ClusterClassVariable{ - Name: workerconfig.MetaVariableName, + Name: v1alpha1.WorkerConfigVariableName, Required: false, Schema: v1alpha1.NutanixNodeConfig{}.VariableSchema(), }) diff --git a/pkg/handlers/nutanix/workerconfig/variables_test.go b/pkg/handlers/nutanix/workerconfig/variables_test.go index 7bc1f39ed..1dbd7f033 100644 --- a/pkg/handlers/nutanix/workerconfig/variables_test.go +++ b/pkg/handlers/nutanix/workerconfig/variables_test.go @@ -10,13 +10,12 @@ 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/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) func TestVariableValidation(t *testing.T) { capitest.ValidateDiscoverVariables( t, - workerconfig.MetaVariableName, + v1alpha1.WorkerConfigVariableName, ptr.To(v1alpha1.NutanixNodeConfig{}.VariableSchema()), false, NewVariable, diff --git a/test/e2e/quick_start_test.go b/test/e2e/quick_start_test.go index 8f8bd0564..50533b4fe 100644 --- a/test/e2e/quick_start_test.go +++ b/test/e2e/quick_start_test.go @@ -19,7 +19,6 @@ 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/variables" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) var _ = Describe("Quick start", Serial, func() { @@ -138,7 +137,7 @@ var _ = Describe("Quick start", Serial, func() { ) addonsConfig, err := variables.Get[v1alpha1.Addons]( clusterVars, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, "addons", ) Expect(err).ToNot(HaveOccurred()) diff --git a/test/e2e/self_hosted_test.go b/test/e2e/self_hosted_test.go index 6eff46b09..e5571fd0f 100644 --- a/test/e2e/self_hosted_test.go +++ b/test/e2e/self_hosted_test.go @@ -17,7 +17,6 @@ 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/variables" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/e2e/framework" ) @@ -73,7 +72,7 @@ var _ = Describe("Self-hosted", Serial, func() { ) addonsConfig, err := variables.Get[v1alpha1.Addons]( clusterVars, - clusterconfig.MetaVariableName, + v1alpha1.ClusterConfigVariableName, "addons", ) Expect(err).ToNot(HaveOccurred())