refactor: use cluster namespaced name for cache key

- Update CacheParams to use types.NamespacedName for user-queryable cache key
- Add newClientWithCluster function to accept cluster information
- Update credentials check to pass cluster info for cache key
- Remove fallback to credentials-based key, always use cluster namespaced name
- Simplify Key() method to match CAPX approach

Author: adarshanand25

pkg/webhook/preflight/nutanix/cache.go

@@ -4,7 +4,7 @@
 package nutanix
 
 import (
-	"fmt"
+	k8stypes "k8s.io/apimachinery/pkg/types"
 
 	v4Converged "github.com/nutanix-cloud-native/prism-go-client/converged/v4"
 	"github.com/nutanix-cloud-native/prism-go-client/environment/types"
@@ -23,6 +23,7 @@ var NutanixConvergedClientV4Cache = v4Converged.NewClientCache()
 
 // CacheParams is the struct that implements ClientCacheParams interface from prism-go-client.
 type CacheParams struct {
+	ClusterNamespacedName   k8stypes.NamespacedName // Optional: cluster namespaced name for user-queryable cache key
 	PrismManagementEndpoint *types.ManagementEndpoint
 }
 
@@ -31,14 +32,7 @@ func (c *CacheParams) ManagementEndpoint() types.ManagementEndpoint {
 	return *c.PrismManagementEndpoint
 }
 
-// Key returns a unique key for the client cache based on the management endpoint.
+// Key returns a unique key for the client cache using the cluster namespaced name.
 func (c *CacheParams) Key() string {
-	endpoint := c.PrismManagementEndpoint
-	// Include address, username, password, and insecure flag to ensure unique keys per credential set
-	return fmt.Sprintf("%s:%s:%s:%t",
-		endpoint.Address.String(),
-		endpoint.Username,
-		endpoint.Password,
-		endpoint.Insecure,
-	)
+	return c.ClusterNamespacedName.String()
 }

pkg/webhook/preflight/nutanix/checker.go

@@ -7,6 +7,7 @@ import (
 	"context"
 
 	"github.com/go-logr/logr"
+	k8stypes "k8s.io/apimachinery/pkg/types"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -89,7 +90,16 @@ func (n *nutanixChecker) Init(
 		// The configuration check must run first, because it initializes data used by all other checks,
 		// and the credentials check second, because it initializes the Nutanix clients used by other checks.
 		n.configurationCheckFactory(cd),
-		n.credentialsCheckFactory(ctx, newClient, cd),
+		n.credentialsCheckFactory(
+			ctx,
+			func(creds prismgoclient.Credentials) (client, error) { //nolint:contextcheck // ctx is captured from closure
+				return newClient(creds, k8stypes.NamespacedName{
+					Name:      cluster.Name,
+					Namespace: cluster.Namespace,
+				})
+			},
+			cd,
+		),
 		n.prismCentralVersionCheckFactory(ctx, cd),
 	}
 

pkg/webhook/preflight/nutanix/clients.go

@@ -13,6 +13,7 @@ import (
 	clustermgmtv4 "github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4/models/clustermgmt/v4/config"
 	netv4 "github.com/nutanix/ntnx-api-golang-clients/networking-go-client/v4/models/networking/v4/config"
 	vmmv4 "github.com/nutanix/ntnx-api-golang-clients/vmm-go-client/v4/models/vmm/v4/content"
+	k8stypes "k8s.io/apimachinery/pkg/types"
 
 	prismgoclient "github.com/nutanix-cloud-native/prism-go-client"
 	"github.com/nutanix-cloud-native/prism-go-client/converged"
@@ -251,14 +252,17 @@ func buildManagementEndpoint(credentials *prismgoclient.Credentials) (*types.Man
 	}, nil
 }
 
+// newClient creates a client with optional cluster information for cache key.
 func newClient(
 	credentials prismgoclient.Credentials, //nolint:gocritic // hugeParam is fine
+	clusterNamespacedName k8stypes.NamespacedName,
 ) (client, error) {
 	endpoint, err := buildManagementEndpoint(&credentials)
 	if err != nil {
 		return nil, fmt.Errorf("failed to build management endpoint: %w", err)
 	}
 	cacheParams := &CacheParams{
+		ClusterNamespacedName:   clusterNamespacedName,
 		PrismManagementEndpoint: endpoint,
 	}
 

pkg/webhook/preflight/nutanix/credentials_test.go

@@ -172,7 +172,10 @@ func TestNewCredentialsCheck_SecretMissingKey(t *testing.T) {
 	}
 	cd := validCheckDependencies()
 	cd.kclient = fake.NewClientBuilder().WithObjects(secret).Build()
-	check := newCredentialsCheck(context.Background(), nil, cd)
+	nclientFactory := func(_ prismgoclient.Credentials) (client, error) {
+		return &clientWrapper{}, nil
+	}
+	check := newCredentialsCheck(context.Background(), nclientFactory, cd)
 	result := check.Run(context.Background())
 	assert.False(t, result.Allowed)
 	assert.False(t, result.InternalError)