Get credentials as part of create client function

Author: dlipovetsky

pkg/webhook/preflight/nutanix/checker.go

@@ -10,8 +10,6 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
-	prismv4 "github.com/nutanix-cloud-native/prism-go-client/v4"
-
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/webhook/preflight"
 )
 
@@ -22,40 +20,31 @@ func (n *Checker) Init(
 	kclient ctrlclient.Client,
 	cluster *clusterv1.Cluster,
 ) []preflight.Check {
+	// Read Nutanix specs from the cluster.
 	prismCentralEndpointSpec,
 		controlPlaneNutanixNodeSpec,
 		nutanixNodeSpecByMachineDeploymentName,
-		errCauses := readNutanixSpecs(cluster)
+		errCauses := specsFromCluster(cluster)
 	if len(errCauses) > 0 {
 		return initErrorCheck(errCauses...)
 	}
 
+	// If no Nutanix specs are found, no checks need to run.
 	if controlPlaneNutanixNodeSpec == nil && len(nutanixNodeSpecByMachineDeploymentName) == 0 {
-		// No Nutanix specs found, no checks to run.
 		return nil
 	}
 
-	// At least one Nutanix spec is defined. Get credentials and create a client,
-	// because all checks require them.
-	credentials, errCauses := getCredentials(ctx, kclient, cluster, prismCentralEndpointSpec)
+	// Create a Nutanix client, because all checks require it.
+	nv4client, errCauses := newV4Client(ctx, kclient, cluster.Namespace, prismCentralEndpointSpec)
 	if len(errCauses) > 0 {
 		return initErrorCheck(errCauses...)
 	}
 
-	nv4client, err := prismv4.NewV4Client(*credentials)
-	if err != nil {
-		return initErrorCheck(
-			preflight.Cause{
-				Message: fmt.Sprintf("failed to initialize Nutanix v4 client: %s", err),
-				Field:   "",
-			})
-	}
-
 	// Initialize checks.
 	checks := []preflight.Check{}
 	if controlPlaneNutanixNodeSpec != nil {
 		checks = append(checks,
-			vmImageCheck(
+			newVMImageCheck(
 				nv4client,
 				controlPlaneNutanixNodeSpec,
 				"cluster.spec.topology[.name=clusterConfig].value.controlPlane.nutanix",
@@ -67,7 +56,7 @@ func (n *Checker) Init(
 			continue
 		}
 		checks = append(checks,
-			vmImageCheck(
+			newVMImageCheck(
 				nv4client,
 				nutanixNodeSpecByMachineDeploymentName[md.Name],
 				fmt.Sprintf(

pkg/webhook/preflight/nutanix/credentials.go

@@ -6,22 +6,45 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	prismgoclient "github.com/nutanix-cloud-native/prism-go-client"
 	prismcredentials "github.com/nutanix-cloud-native/prism-go-client/environment/credentials"
+	prismv4 "github.com/nutanix-cloud-native/prism-go-client/v4"
 
 	carenv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/webhook/preflight"
 )
 
 const credentialsSecretDataKey = "credentials"
 
+func newV4Client(ctx context.Context,
+	client ctrlclient.Client,
+	clusterNamespace string,
+	prismCentralEndpointSpec *carenv1.NutanixPrismCentralEndpointSpec,
+) (*prismv4.Client, []preflight.Cause) {
+	credentials, causes := getCredentials(ctx, client, clusterNamespace, prismCentralEndpointSpec)
+	if len(causes) > 0 {
+		return nil, causes
+	}
+
+	nv4client, err := prismv4.NewV4Client(*credentials)
+	if err != nil {
+		return nil, []preflight.Cause{
+			{
+				Message: fmt.Sprintf("failed to create Prism Central client: %s", err),
+				Field:   "cluster.spec.topology.variables[.name=clusterConfig].nutanix.prismCentralEndpoint",
+			},
+		}
+	}
+
+	return nv4client, nil
+}
+
 func getCredentials(
 	ctx context.Context,
 	client ctrlclient.Client,
-	cluster *clusterv1.Cluster,
+	clusterNamespace string,
 	prismCentralEndpointSpec *carenv1.NutanixPrismCentralEndpointSpec,
 ) (*prismgoclient.Credentials, []preflight.Cause) {
 	if prismCentralEndpointSpec == nil {
@@ -36,7 +59,7 @@ func getCredentials(
 	if prismCentralEndpointSpec.Credentials.SecretRef.Name == "" {
 		return nil, []preflight.Cause{
 			{
-				Message: "Prism Central credentials secret reference is missing the name",
+				Message: "Prism Central credentials reference is missing the name",
 				Field:   "cluster.spec.topology.variables[.name=clusterConfig].nutanix.prismCentralEndpoint.credentials.secretRef.name",
 			},
 		}
@@ -46,14 +69,14 @@ func getCredentials(
 	if err := client.Get(
 		ctx,
 		types.NamespacedName{
-			Namespace: cluster.Namespace,
+			Namespace: clusterNamespace,
 			Name:      prismCentralEndpointSpec.Credentials.SecretRef.Name,
 		},
 		credentialsSecret,
 	); err != nil {
 		return nil, []preflight.Cause{
 			{
-				Message: fmt.Sprintf("failed to get the credentials Secret: %s", err),
+				Message: fmt.Sprintf("failed to get credentials Secret: %s", err),
 				Field:   "cluster.spec.topology.variables[.name=clusterConfig].nutanix.prismCentralEndpoint.credentials.secretRef",
 			},
 		}

pkg/webhook/preflight/nutanix/image.go

@@ -13,7 +13,7 @@ import (
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/webhook/preflight"
 )
 
-func vmImageCheck(
+func newVMImageCheck(
 	client *prismv4.Client,
 	nutanixNodeSpec *carenv1.NutanixNodeSpec,
 	nutanixNodeSpecField string,

pkg/webhook/preflight/nutanix/specs.go

@@ -10,7 +10,7 @@ import (
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/webhook/preflight"
 )
 
-func readNutanixSpecs(
+func specsFromCluster(
 	cluster *clusterv1.Cluster,
 ) (*carenv1.NutanixPrismCentralEndpointSpec, *carenv1.NutanixNodeSpec, map[string]*carenv1.NutanixNodeSpec, []preflight.Cause) {
 	var prismCentralEndpointSpec *carenv1.NutanixPrismCentralEndpointSpec