fixup! refactor: Pass nutanix spec into CCM templating func

Author: jimmidyson

pkg/handlers/generic/lifecycle/ccm/nutanix/handler.go

@@ -15,6 +15,7 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
 	apivariables "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/variables"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/addons"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/config"
@@ -125,7 +126,7 @@ func (p *provider) Apply(
 		),
 		p.client,
 		helmChart,
-	).WithValueTemplater(templateValuesFunc(clusterConfig))
+	).WithValueTemplater(templateValuesFunc(clusterConfig.Nutanix))
 
 	if err = applier.Apply(ctx, cluster, p.config.DefaultsNamespace(), log); err != nil {
 		return fmt.Errorf("failed to apply nutanix-ccm installation HelmChartProxy: %w", err)
@@ -135,7 +136,7 @@ func (p *provider) Apply(
 }
 
 func templateValuesFunc(
-	clusterConfig *apivariables.ClusterConfigSpec,
+	nutanixConfig *v1alpha1.NutanixSpec,
 ) func(*clusterv1.Cluster, string) (string, error) {
 	return func(_ *clusterv1.Cluster, valuesTemplate string) (string, error) {
 		helmValuesTemplate, err := template.New("").Parse(valuesTemplate)
@@ -150,15 +151,15 @@ func templateValuesFunc(
 			PrismCentralAdditionalTrustBundle string
 		}
 
-		address, port, err := clusterConfig.Nutanix.PrismCentralEndpoint.ParseURL()
+		address, port, err := nutanixConfig.PrismCentralEndpoint.ParseURL()
 		if err != nil {
 			return "", err
 		}
 		templateInput := input{
 			PrismCentralHost:                  address,
 			PrismCentralPort:                  port,
-			PrismCentralInsecure:              clusterConfig.Nutanix.PrismCentralEndpoint.Insecure,
-			PrismCentralAdditionalTrustBundle: clusterConfig.Nutanix.PrismCentralEndpoint.AdditionalTrustBundle,
+			PrismCentralInsecure:              nutanixConfig.PrismCentralEndpoint.Insecure,
+			PrismCentralAdditionalTrustBundle: nutanixConfig.PrismCentralEndpoint.AdditionalTrustBundle,
 		}
 
 		var b bytes.Buffer

pkg/handlers/generic/lifecycle/ccm/nutanix/handler_test.go

@@ -123,7 +123,7 @@ func Test_templateValues(t *testing.T) {
 		tt := tests[idx]
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			out, err := templateValuesFunc(tt.clusterConfig)(nil, tt.in)
+			out, err := templateValuesFunc(tt.clusterConfig.Nutanix)(nil, tt.in)
 			require.NoError(t, err)
 			assert.Equal(t, tt.expected, out)
 		})

pkg/webhook/cluster/webhook_suite_test.go

@@ -93,26 +93,5 @@ func TestMain(m *testing.M) {
 				},
 			}},
 		},
-
-		// 			- admissionReviewVersions:
-		//   - v1
-		// clientConfig:
-		//   service:
-		//     name: '{{ include "chart.name" . }}-admission'
-		//     namespace: '{{ .Release.Namespace }}'
-		//     path: /mutate-v1beta1-cluster
-		// failurePolicy: Fail
-		// name: cluster-defaulter.caren.nutanix.com
-		// rules:
-		//   - apiGroups:
-		//       - cluster.x-k8s.io
-		//     apiVersions:
-		//       - '*'
-		//     operations:
-		//       - CREATE
-		//       - UPDATE
-		//     resources:
-		//       - clusters
-		// sideEffects: None
 	}))
 }

test/e2e/clusterautoscaler_helpers.go

@@ -97,13 +97,9 @@ func WaitForClusterAutoscalerToBeReadyForWorkloadCluster(
 		WaitForHelmReleaseProxyReadyForCluster(
 			ctx,
 			WaitForHelmReleaseProxyReadyForClusterInput{
-				GetLister: input.ClusterProxy.GetClient(),
-				Cluster:   input.WorkloadCluster,
-				HelmReleaseName: fmt.Sprintf(
-					"%s-%s",
-					clusterAutoscalerReleaseName,
-					input.WorkloadCluster.Annotations[v1alpha1.ClusterUUIDAnnotationKey],
-				),
+				GetLister:       input.ClusterProxy.GetClient(),
+				Cluster:         input.WorkloadCluster,
+				HelmReleaseName: clusterAutoscalerReleaseName,
 			},
 			input.HelmReleaseIntervals...,
 		)