make kubeconfig reader per provider

cmd/eksctl-anywhere/cmd/createcluster.go

@@ -188,7 +188,8 @@ func (cc *createClusterOptions) createCluster(cmd *cobra.Command, _ []string) er
 		WithPackageInstaller(clusterSpec, cc.installPackages, cc.managementKubeconfig).
 		WithValidatorClients().
 		WithCreateClusterDefaulter(createCLIConfig).
-		WithClusterApplier()
+		WithClusterApplier().
+		WithKubeconfigReader(clusterConfig)
 
 	if cc.timeoutOptions.noTimeouts {
 		factory.WithNoTimeouts()
@@ -232,13 +233,7 @@ func (cc *createClusterOptions) createCluster(cmd *cobra.Command, _ []string) er
 	}
 	createValidations := createvalidations.New(validationOpts)
 
-	clusCreator := clustermanager.ClusterCreator{
-		Applier: deps.ClusterApplier,
-		KM: clustermanager.KubeconfigManager{
-			ClientFactory: deps.UnAuthKubeClient,
-			FS:            deps.Writer,
-		},
-	}
+	clusCreator := clustermanager.NewClusterCreator(deps.ClusterApplier, deps.KubeconfigReader, deps.Writer)
 
 	if features.UseNewWorkflows().IsActive() {
 		deps, err = factory.

pkg/clustermanager/cluster_creator.go

@@ -11,44 +11,57 @@ import (
 )
 
 type ClusterCreator struct {
-	Applier Applier
-	KM      KubeconfigManager
+	applier          Applier
+	kubeconfigReader providers.KubeconfigReader
+	fs               filewriter.FileWriter
+}
+
+func NewClusterCreator(applier Applier, kubeconfigReader providers.KubeconfigReader, fs filewriter.FileWriter) ClusterCreator {
+	return ClusterCreator{
+		applier:          applier,
+		kubeconfigReader: kubeconfigReader,
+		fs:               fs,
+	}
 }
 
 // CreateSync creates a workload cluster using the EKS-A controller and returns the types.Cluster object for that cluster.
 func (cc ClusterCreator) CreateSync(ctx context.Context, spec *cluster.Spec, managementCluster *types.Cluster, provider providers.Provider) (*types.Cluster, error) {
-	err := cc.Applier.Run(ctx, spec, *managementCluster)
+	err := cc.applier.Run(ctx, spec, *managementCluster)
 	if err != nil {
 		return nil, err
 	}
 
-	return cc.getWorkloadCluster(ctx, spec.Cluster.Name, managementCluster, provider)
+	return cc.buildClusterAccess(ctx, spec.Cluster.Name, managementCluster, provider)
+}
+
+// Run exposes the Applier's run.
+func (cc ClusterCreator) Run(ctx context.Context, spec *cluster.Spec, managementCluster types.Cluster) error {
+	return cc.applier.Run(ctx, spec, managementCluster)
 }
 
-func (cc ClusterCreator) getWorkloadCluster(ctx context.Context, clusterName string, management *types.Cluster, provider providers.Provider) (*types.Cluster, error) {
-	workloadCluster := &types.Cluster{
+func (cc ClusterCreator) buildClusterAccess(ctx context.Context, clusterName string, management *types.Cluster, provider providers.Provider) (*types.Cluster, error) {
+	cluster := &types.Cluster{
 		Name:               clusterName,
 		ExistingManagement: management.ExistingManagement,
 	}
 
-	fh, path, err := cc.KM.FS.Create(
+	fh, path, err := cc.fs.Create(
 		kubeconfig.FormatWorkloadClusterKubeconfigFilename(clusterName),
 		filewriter.PersistentFile,
 		filewriter.Permission0600,
 	)
-
 	if err != nil {
 		return nil, err
 	}
 
-	err = cc.KM.UpdateKubeconfig(ctx, clusterName, management.KubeconfigFile, provider, fh)
+	defer fh.Close()
+
+	err = cc.kubeconfigReader.WriteKubeconfig(ctx, clusterName, management.KubeconfigFile, fh)
 	if err != nil {
 		return nil, err
 	}
 
-	defer fh.Close()
-
-	workloadCluster.KubeconfigFile = path
+	cluster.KubeconfigFile = path
 
-	return workloadCluster, nil
+	return cluster, nil
 }

pkg/dependencies/factory.go

@@ -112,6 +112,7 @@ type Dependencies struct {
 	ExecutableBuilder           *executables.ExecutablesBuilder
 	CreateClusterDefaulter      cli.CreateClusterDefaulter
 	UpgradeClusterDefaulter     cli.UpgradeClusterDefaulter
+	KubeconfigReader            providers.KubeconfigReader
 }
 
 // KubeClients defines super struct that exposes all behavior.
@@ -580,6 +581,27 @@ func (f *Factory) WithProvider(clusterConfigFile string, clusterConfig *v1alpha1
 	return f
 }
 
+// WithKubeconfigReader
+func (f *Factory) WithKubeconfigReader(clusterConfig *v1alpha1.Cluster) *Factory {
+	genericKubeconfigReader := providers.BuildKubeconfigReader(f.dependencies.UnAuthKubeClient, time.Minute, time.Second)
+	switch clusterConfig.Spec.DatacenterRef.Kind {
+	case v1alpha1.VSphereDatacenterKind:
+		f.dependencies.KubeconfigReader = genericKubeconfigReader
+	case v1alpha1.CloudStackDatacenterKind:
+		f.dependencies.KubeconfigReader = genericKubeconfigReader
+	case v1alpha1.DockerDatacenterKind:
+		f.dependencies.KubeconfigReader = docker.BuildKubeconfigReader(f.dependencies.Provider, f.dependencies.UnAuthKubeClient, time.Minute, time.Second)
+	case v1alpha1.TinkerbellDatacenterKind:
+		f.dependencies.KubeconfigReader = genericKubeconfigReader
+	case v1alpha1.SnowDatacenterKind:
+		f.dependencies.KubeconfigReader = genericKubeconfigReader
+	case v1alpha1.NutanixDatacenterKind:
+		f.dependencies.KubeconfigReader = genericKubeconfigReader
+	}
+
+	return f
+}
+
 func (f *Factory) WithDocker() *Factory {
 	f.buildSteps = append(f.buildSteps, func(ctx context.Context) error {
 		if f.dependencies.DockerClient != nil {

pkg/providers/docker/docker.go

@@ -1,18 +1,23 @@
 package docker
 
 import (
+	"bytes"
 	"context"
 	_ "embed"
 	"fmt"
+	"io"
 	"os"
 	"regexp"
+	"time"
 
 	etcdv1 "github.com/aws/etcdadm-controller/api/v1beta1"
+	corev1 "k8s.io/api/core/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
 
 	"github.com/aws/eks-anywhere/pkg/api/v1alpha1"
 	"github.com/aws/eks-anywhere/pkg/bootstrapper"
+	"github.com/aws/eks-anywhere/pkg/clients/kubernetes"
 	"github.com/aws/eks-anywhere/pkg/cluster"
 	"github.com/aws/eks-anywhere/pkg/clusterapi"
 	"github.com/aws/eks-anywhere/pkg/config"
@@ -24,6 +29,7 @@ import (
 	"github.com/aws/eks-anywhere/pkg/providers/common"
 	"github.com/aws/eks-anywhere/pkg/registrymirror"
 	"github.com/aws/eks-anywhere/pkg/registrymirror/containerd"
+	"github.com/aws/eks-anywhere/pkg/retrier"
 	"github.com/aws/eks-anywhere/pkg/templater"
 	"github.com/aws/eks-anywhere/pkg/types"
 	releasev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1"
@@ -52,6 +58,14 @@ type provider struct {
 	templateBuilder       *DockerTemplateBuilder
 }
 
+// DockerKubeconfigReader reads the kubeconfig secret on a cluster and copies the contents to a writer.
+type DockerKubeconfigReader struct {
+	provider providers.Provider
+	client   *kubernetes.UnAuthClient
+	timeout  time.Duration
+	backoff  time.Duration
+}
+
 func (p *provider) InstallCustomProviderComponents(ctx context.Context, kubeconfigFile string) error {
 	return nil
 }
@@ -531,6 +545,57 @@ func (p *provider) UpdateKubeConfig(content *[]byte, clusterName string) error {
 	}
 }
 
+// BuildKubeconfigReader creates a KubeconfigReader.
+func BuildKubeconfigReader(provider providers.Provider, unauthClient *kubernetes.UnAuthClient, timeout time.Duration, backoff time.Duration) providers.KubeconfigReader {
+	return DockerKubeconfigReader{
+		client:   unauthClient,
+		timeout:  timeout,
+		backoff:  backoff,
+		provider: provider,
+	}
+}
+
+// WriteKubeconfig retrieves the contents of the specified cluster's kubeconfig from a secret and copies it to an io.Writer.
+func (kr DockerKubeconfigReader) WriteKubeconfig(ctx context.Context, clusterName, kubeconfigPath string, w io.Writer) error {
+	kubeconfigSecret := &corev1.Secret{}
+
+	err := retrier.New(
+		kr.timeout,
+		retrier.WithRetryPolicy(retrier.BackOffPolicy(kr.backoff)),
+	).Retry(func() error {
+		client, err := kr.client.BuildClientFromKubeconfig(kubeconfigPath)
+		if err != nil {
+			return err
+		}
+
+		err = client.Get(ctx, fmt.Sprintf("%s-kubeconfig", clusterName), constants.EksaSystemNamespace, kubeconfigSecret)
+		if err != nil {
+			return err
+		}
+
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return err
+	}
+
+	rawkubeconfig := kubeconfigSecret.Data["value"]
+	if err := kr.provider.UpdateKubeConfig(&rawkubeconfig, clusterName); err != nil {
+		return err
+	}
+
+	if _, err := io.Copy(w, bytes.NewReader(rawkubeconfig)); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // this is required for docker provider.
 func getUpdatedKubeConfigContent(content *[]byte, dockerLbPort string) {
 	mc := regexp.MustCompile("server:.*")

pkg/providers/kubeconfig_reader.go

@@ -0,0 +1,66 @@
+package providers
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+
+	"github.com/aws/eks-anywhere/pkg/clients/kubernetes"
+	"github.com/aws/eks-anywhere/pkg/constants"
+	"github.com/aws/eks-anywhere/pkg/retrier"
+)
+
+// GenericKubeconfigReader reads the kubeconfig secret on a cluster and copies the contents to a writer.
+type GenericKubeconfigReader struct {
+	client  *kubernetes.UnAuthClient
+	timeout time.Duration
+	backoff time.Duration
+}
+
+// BuildKubeconfigReader creates a KubeconfigReader.
+func BuildKubeconfigReader(unauthClient *kubernetes.UnAuthClient, timeout time.Duration, backoff time.Duration) KubeconfigReader {
+	return GenericKubeconfigReader{
+		client:  unauthClient,
+		timeout: timeout,
+		backoff: backoff,
+	}
+}
+
+// WriteKubeconfig retrieves the contents of the specified cluster's kubeconfig from a secret and copies it to an io.Writer.
+func (kr GenericKubeconfigReader) WriteKubeconfig(ctx context.Context, clusterName, kubeconfigPath string, w io.Writer) error {
+	kubeconfigSecret := &corev1.Secret{}
+
+	err := retrier.New(
+		kr.timeout,
+		retrier.WithRetryPolicy(retrier.BackOffPolicy(kr.backoff)),
+	).Retry(func() error {
+		client, err := kr.client.BuildClientFromKubeconfig(kubeconfigPath)
+		if err != nil {
+			return err
+		}
+
+		err = client.Get(ctx, fmt.Sprintf("%s-kubeconfig", clusterName), constants.EksaSystemNamespace, kubeconfigSecret)
+		if err != nil {
+			return err
+		}
+
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	if _, err := io.Copy(w, bytes.NewReader(kubeconfigSecret.Data["value"])); err != nil {
+		return err
+	}
+
+	return nil
+}

pkg/providers/provider.go

@@ -2,6 +2,7 @@ package providers
 
 import (
 	"context"
+	"io"
 
 	"github.com/aws/eks-anywhere/pkg/api/v1alpha1"
 	"github.com/aws/eks-anywhere/pkg/bootstrapper"
@@ -66,3 +67,8 @@ type MachineConfig interface {
 	GetNamespace() string
 	GetName() string
 }
+
+// KubeconfigReader reads the kubeconfig secret on a cluster and copies the contents to a writer.
+type KubeconfigReader interface {
+	WriteKubeconfig(ctx context.Context, clusterName, kubeconfig string, w io.Writer) error
+}

pkg/task/task.go

@@ -10,7 +10,6 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"github.com/aws/eks-anywhere/pkg/cluster"
-	"github.com/aws/eks-anywhere/pkg/clustermanager"
 	"github.com/aws/eks-anywhere/pkg/filewriter"
 	"github.com/aws/eks-anywhere/pkg/logger"
 	"github.com/aws/eks-anywhere/pkg/providers"
@@ -38,7 +37,7 @@ type CommandContext struct {
 	PackageInstaller          interfaces.PackageInstaller
 	EksdUpgrader              interfaces.EksdUpgrader
 	ClusterUpgrader           interfaces.ClusterUpgrader
-	ClusterCreator            clustermanager.ClusterCreator
+	ClusterCreator            interfaces.ClusterCreator
 	CAPIManager               interfaces.CAPIManager
 	ClusterSpec               *cluster.Spec
 	CurrentClusterSpec        *cluster.Spec