Merge pull request #50 from aifoundry-org/clientset-passthrough

pass clientset through and keep it

Author: deitch

pkg/cluster/cluster.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/aifoundry-org/oxide-controller/pkg/util"
+	"k8s.io/client-go/kubernetes"
 	"tailscale.com/client/tailscale/v2"
 
 	"github.com/oxidecomputer/oxide.go/oxide"
@@ -35,6 +36,7 @@ type Cluster struct {
 	imageParallelism             int
 	tailscaleAPIKey              string
 	tailscaleTailnet             string
+	clientset                    *kubernetes.Clientset
 }
 
 // New creates a new Cluster instance
@@ -309,15 +311,22 @@ func (c *Cluster) ensureClusterExists(ctx context.Context) (newKubeconfig []byte
 			secrets[secretKeyWorkerCount] = []byte(fmt.Sprintf("%d", c.workerCount))
 		}
 
+		// get a Kubernetes client
+		clientset, err := getClientset(kubeconfig)
+		if err != nil {
+			return nil, fmt.Errorf("unable to get Kubernetes clientset: %w", err)
+		}
+		c.clientset = clientset
+
 		// ensure we have the namespace we need
 		namespace := c.namespace
-		if err := createNamespace(ctx, namespace, c.kubeconfig); err != nil {
+		if err := createNamespace(ctx, clientset, namespace); err != nil {
 			return nil, fmt.Errorf("failed to create namespace: %w", err)
 		}
 
 		// save the join token, system ssh key pair, user ssh key to the Kubernetes secret
 		c.logger.Debugf("Saving secret %s/%s to Kubernetes", namespace, secretName)
-		if err := saveSecret(ctx, c.logger, namespace, secretName, c.kubeconfig, secrets); err != nil {
+		if err := saveSecret(ctx, clientset, c.logger, namespace, secretName, secrets); err != nil {
 			return nil, fmt.Errorf("failed to save secret: %w", err)
 		}
 

pkg/cluster/namespace.go

@@ -7,19 +7,15 @@ import (
 	v1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
 )
 
 // createNamespace ensures a namespace exists or creates it.
-func createNamespace(ctx context.Context, namespace string, kubeconfig []byte) error {
-	clientset, err := getClientset(kubeconfig)
-	if err != nil {
-		return fmt.Errorf("failed to get clientset: %w", err)
-	}
-
+func createNamespace(ctx context.Context, clientset *kubernetes.Clientset, namespace string) error {
 	nsClient := clientset.CoreV1().Namespaces()
 
 	// Check if the namespace already exists
-	_, err = nsClient.Get(ctx, namespace, metav1.GetOptions{})
+	_, err := nsClient.Get(ctx, namespace, metav1.GetOptions{})
 	if err == nil {
 		// Already exists
 		return nil

pkg/cluster/secret.go

@@ -10,6 +10,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
 )
 
 // getSecretValue retrieves a specific value from the secret
@@ -73,7 +74,7 @@ func (c *Cluster) SetWorkerCount(ctx context.Context, count int) error {
 		return fmt.Errorf("failed to get secret: %w", err)
 	}
 	secretMap[secretKeyWorkerCount] = []byte(fmt.Sprintf("%d", count))
-	if err := saveSecret(ctx, c.logger, c.namespace, c.secretName, c.kubeconfig, secretMap); err != nil {
+	if err := saveSecret(ctx, c.clientset, c.logger, c.namespace, c.secretName, secretMap); err != nil {
 		return fmt.Errorf("failed to save secret: %w", err)
 	}
 	return nil
@@ -103,13 +104,10 @@ func getSecret(ctx context.Context, logger *log.Entry, kubeconfigRaw []byte, sec
 }
 
 // saveSecret save a secret to the Kubernetes cluster
-func saveSecret(ctx context.Context, logger *log.Entry, namespace, name string, kubeconfig []byte, data map[string][]byte) error {
-	logger.Debugf("Saving secret %s with kubeconfig size %d and keymap size %d", name, len(kubeconfig), len(data))
+func saveSecret(ctx context.Context, clientset *kubernetes.Clientset, logger *log.Entry, namespace, name string, data map[string][]byte) error {
+	logger.Debugf("Saving secret %s with keymap size %d", name, len(data))
 
-	clientset, err := getClientset(kubeconfig)
-	if err != nil {
-		return err
-	}
+	secretsClient := clientset.CoreV1().Secrets(namespace)
 
 	// Prepare the secret object
 	secret := &v1.Secret{
@@ -121,10 +119,8 @@ func saveSecret(ctx context.Context, logger *log.Entry, namespace, name string,
 		Type: v1.SecretTypeOpaque,
 	}
 
-	secretsClient := clientset.CoreV1().Secrets(namespace)
-
 	// Check if the secret exists
-	_, err = secretsClient.Get(context.TODO(), name, metav1.GetOptions{})
+	_, err := secretsClient.Get(context.TODO(), name, metav1.GetOptions{})
 	if err != nil {
 		if errors.IsNotFound(err) {
 			// Create new secret