Fix controller generating cilium manifests with registry mirror (#7170)

* generate helm from a factory to load registry mirror configuration from management cluster

* move helmfactory to helm package (no other changes)

* decoupled executables from helm factory, renamed helm tyoes and got rid of client under pkg/cluster/helm

* changes to other files due to change executable builder signature to implement helm executable builder

* add helm env client factory implementation for cilium.HelmClientFactory

* remove helm.ClientFactory dependency on ops it doesn't need

* rename GetClientForCluster -> Get and addressed other PR comments

* move WithHelmClientFactory to controller factory and build cilium Templater there and added comments

* add generated files

* dropping registry client and executableclient interfaces in favor of just client

* re-build client only when registry changes

* fix linting error

* moved WithEnv implementaton details back to executable helm

* add new helm executeable unit test

* always return new client in helm client factory and add comment to ProxyConfig

* refactored ExecutableBuilder -> ClientBuilder

* extract code from poluted pkg/helm/factory.go file into client.go and config.go

* remove helmClient from struct. not needed to store

* referencing implementation instead of interface in factory dependencies

* change joinEnv to mergeMap

Author: cxbrowne1207

.gitignore

@@ -26,3 +26,4 @@ docs/.hugo_build.lock
 *.log
 pkg/executables/TestDeployTemplate*
 pkg/files/config
+config/crd/bases/_.yaml

Makefile

@@ -567,6 +567,8 @@ mocks: ## Generate mocks
 	${MOCKGEN} -destination=cmd/eksctl-anywhere/cmd/internal/commands/artifacts/mocks/import.go -package=mocks -source "cmd/eksctl-anywhere/cmd/internal/commands/artifacts/import.go"
 	${MOCKGEN} -destination=cmd/eksctl-anywhere/cmd/internal/commands/artifacts/mocks/import_tools_image.go -package=mocks -source "cmd/eksctl-anywhere/cmd/internal/commands/artifacts/import_tools_image.go"
 	${MOCKGEN} -destination=pkg/helm/mocks/download.go -package=mocks -source "pkg/helm/download.go"
+	${MOCKGEN} -destination=pkg/helm/mocks/factory.go -package=mocks -source "pkg/helm/factory.go"
+	${MOCKGEN} -destination=pkg/helm/mocks/client.go -package=mocks -source "pkg/helm/client.go"
 	${MOCKGEN} -destination=pkg/aws/mocks/ec2.go -package=mocks -source "pkg/aws/ec2.go"
 	${MOCKGEN} -destination=pkg/aws/mocks/imds.go -package=mocks -source "pkg/aws/imds.go"
 	${MOCKGEN} -destination=pkg/aws/mocks/snowballdevice.go -package=mocks -source "pkg/aws/snowballdevice.go"

cmd/eksctl-anywhere/cmd/common.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/aws/eks-anywhere/pkg/cluster"
 	"github.com/aws/eks-anywhere/pkg/dependencies"
-	"github.com/aws/eks-anywhere/pkg/executables"
 	"github.com/aws/eks-anywhere/pkg/files"
+	"github.com/aws/eks-anywhere/pkg/helm"
 	"github.com/aws/eks-anywhere/pkg/kubeconfig"
 	"github.com/aws/eks-anywhere/pkg/manifests/bundles"
 	"github.com/aws/eks-anywhere/pkg/version"
@@ -56,7 +56,7 @@ func NewDependenciesForPackages(ctx context.Context, opts ...PackageOpt) (*depen
 		WithExecutableBuilder().
 		WithManifestReader().
 		WithKubectl().
-		WithHelm(executables.WithInsecure()).
+		WithHelm(helm.WithInsecure()).
 		WithCuratedPackagesRegistry(config.registryName, config.kubeVersion, version.Get()).
 		WithPackageControllerClient(config.spec, config.kubeConfig).
 		WithLogger().

cmd/eksctl-anywhere/cmd/deprecated_importimages.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/aws/eks-anywhere/pkg/constants"
 	"github.com/aws/eks-anywhere/pkg/executables"
+	"github.com/aws/eks-anywhere/pkg/helm"
 	"github.com/aws/eks-anywhere/pkg/logger"
 	"github.com/aws/eks-anywhere/pkg/networkutils"
 	"github.com/aws/eks-anywhere/pkg/registrymirror"
@@ -82,7 +83,7 @@ func importImages(ctx context.Context, clusterSpecPath string) error {
 		return fmt.Errorf("unable to initialize executables: %v", err)
 	}
 	defer closer.CheckErr(ctx)
-	helmExecutable := executableBuilder.BuildHelmExecutable(executables.WithInsecure())
+	helmExecutable := executableBuilder.BuildHelmExecutable(helm.WithInsecure())
 
 	if clusterSpec.Cluster.Spec.RegistryMirrorConfiguration == nil || clusterSpec.Cluster.Spec.RegistryMirrorConfiguration.Endpoint == "" {
 		return fmt.Errorf("endpoint not set. It is necessary to define a valid endpoint in your spec (registryMirrorConfiguration.endpoint)")
@@ -123,7 +124,7 @@ func importImage(ctx context.Context, docker *executables.Docker, image string,
 	return docker.PushImage(ctx, image, endpoint)
 }
 
-func importCharts(ctx context.Context, helm *executables.Helm, charts map[string]*v1alpha1.Image, endpoint, username, password string) error {
+func importCharts(ctx context.Context, helm helm.Client, charts map[string]*v1alpha1.Image, endpoint, username, password string) error {
 	if err := helm.RegistryLogin(ctx, endpoint, username, password); err != nil {
 		return err
 	}
@@ -135,7 +136,7 @@ func importCharts(ctx context.Context, helm *executables.Helm, charts map[string
 	return nil
 }
 
-func importChart(ctx context.Context, helm *executables.Helm, chart v1alpha1.Image, endpoint string) error {
+func importChart(ctx context.Context, helm helm.Client, chart v1alpha1.Image, endpoint string) error {
 	uri, chartVersion := getChartUriAndVersion(chart)
 	if err := helm.PullChart(ctx, uri, chartVersion); err != nil {
 		return err

cmd/eksctl-anywhere/cmd/downloadimages.go

@@ -58,9 +58,9 @@ type downloadImagesCommand struct {
 
 func (c downloadImagesCommand) Run(ctx context.Context) error {
 	factory := dependencies.NewFactory()
-	helmOpts := []executables.HelmOpt{}
+	helmOpts := []helm.Opt{}
 	if c.insecure {
-		helmOpts = append(helmOpts, executables.WithInsecure())
+		helmOpts = append(helmOpts, helm.WithInsecure())
 	}
 	deps, err := factory.
 		WithFileReader().

cmd/eksctl-anywhere/cmd/import_images.go

@@ -108,9 +108,9 @@ func (c ImportImagesCommand) Call(ctx context.Context) error {
 		return err
 	}
 
-	helmOpts := []executables.HelmOpt{}
+	helmOpts := []helm.Opt{}
 	if c.insecure {
-		helmOpts = append(helmOpts, executables.WithInsecure())
+		helmOpts = append(helmOpts, helm.WithInsecure())
 	}
 
 	deps, err = factory.

config/crd/bases/anywhere.eks.amazonaws.com_clusters.yaml

@@ -66,6 +66,8 @@ spec:
                       in the cluster
                     properties:
                       cilium:
+                        description: CiliumConfig contains configuration specific
+                          to the Cilium CNI.
                         properties:
                           egressMasqueradeInterfaces:
                             description: EgressMasquaradeInterfaces determines which
@@ -107,6 +109,8 @@ spec:
                             type: boolean
                         type: object
                       kindnetd:
+                        description: KindnetdConfig contains configuration specific
+                          to the Kindnetd CNI.
                         type: object
                     type: object
                   dns:

config/crd/bases/anywhere.eks.amazonaws.com_nodeupgrades.yaml

@@ -46,6 +46,8 @@ spec:
                   nodes and ignored for worker nodes.
                 type: boolean
               kubernetesVersion:
+                description: 'TODO(in-place): Determine if there''s a way to get these
+                  dynamically instead of expecting it from the CRD.'
                 type: string
               machine:
                 description: Machine is a reference to the CAPI Machine that needs

controllers/factory.go

@@ -20,6 +20,8 @@ import (
 	"github.com/aws/eks-anywhere/pkg/dependencies"
 	"github.com/aws/eks-anywhere/pkg/executables"
 	"github.com/aws/eks-anywhere/pkg/executables/cmk"
+	"github.com/aws/eks-anywhere/pkg/helm"
+	"github.com/aws/eks-anywhere/pkg/networking/cilium"
 	ciliumreconciler "github.com/aws/eks-anywhere/pkg/networking/cilium/reconciler"
 	cnireconciler "github.com/aws/eks-anywhere/pkg/networking/reconciler"
 	"github.com/aws/eks-anywhere/pkg/providers/cloudstack"
@@ -56,6 +58,8 @@ type Factory struct {
 	deps                         *dependencies.Dependencies
 	packageControllerClient      *curatedpackages.PackageControllerClient
 	cloudStackValidatorRegistry  cloudstack.ValidatorRegistry
+	ciliumTemplater              *cilium.Templater
+	helmClientFactory            cilium.HelmClientFactory
 }
 
 type Reconcilers struct {
@@ -465,15 +469,47 @@ func (f *Factory) withCloudStackValidatorRegistry() *Factory {
 	return f
 }
 
+// withHelmClientFactory configures the HelmClientFactory dependency with a helm.ClientFactory.
+func (f *Factory) withHelmClientFactory() *Factory {
+	f.dependencyFactory.WithExecutableBuilder()
+
+	f.buildSteps = append(f.buildSteps, func(ctx context.Context) error {
+		if f.helmClientFactory != nil {
+			return nil
+		}
+
+		f.helmClientFactory = helm.NewClientForClusterFactory(f.manager.GetClient(), f.deps.ExecutableBuilder)
+		return nil
+	})
+
+	return f
+}
+
+func (f *Factory) withCiliumTemplater() *Factory {
+	f.withHelmClientFactory()
+
+	f.buildSteps = append(f.buildSteps, func(ctx context.Context) error {
+		if f.ciliumTemplater != nil {
+			return nil
+		}
+
+		f.ciliumTemplater = cilium.NewTemplater(f.helmClientFactory)
+
+		return nil
+	})
+
+	return f
+}
+
 func (f *Factory) withCNIReconciler() *Factory {
-	f.dependencyFactory.WithCiliumTemplater()
+	f.withCiliumTemplater()
 
 	f.buildSteps = append(f.buildSteps, func(ctx context.Context) error {
 		if f.cniReconciler != nil {
 			return nil
 		}
 
-		f.cniReconciler = cnireconciler.New(ciliumreconciler.New(f.deps.CiliumTemplater))
+		f.cniReconciler = cnireconciler.New(ciliumreconciler.New(f.ciliumTemplater))
 
 		return nil
 	})

internal/test/cluster.go

@@ -3,6 +3,7 @@ package test
 import (
 	"embed"
 	"fmt"
+	"net"
 	"path/filepath"
 	"runtime"
 	"testing"
@@ -145,3 +146,11 @@ func EksdReleaseFromTestData(t *testing.T) *eksdv1alpha1.Release {
 func SetTag(image *releasev1alpha1.Image, tag string) {
 	image.URI = fmt.Sprintf("%s:%s", image.Image(), tag)
 }
+
+// RegistryMirrorEndpoint returns the address of the registry mirror configured on the Cluster if any. Just the host and the port.
+func RegistryMirrorEndpoint(cluster *v1alpha1.Cluster) string {
+	if cluster.Spec.RegistryMirrorConfiguration != nil {
+		return net.JoinHostPort(cluster.Spec.RegistryMirrorConfiguration.Endpoint, cluster.Spec.RegistryMirrorConfiguration.Port)
+	}
+	return ""
+}

pkg/cluster/mocks/helm.go

@@ -4,17 +4,18 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/aws/eks-anywhere/pkg/executables"
+	"github.com/aws/eks-anywhere/pkg/helm"
 )
 
 type CustomRegistry struct {
-	*executables.Helm
+	helm.Client
 	registry string
 }
 
-func NewCustomRegistry(helm *executables.Helm, registry string) *CustomRegistry {
+// NewCustomRegistry returns a new CustomRegistry.
+func NewCustomRegistry(helm helm.Client, registry string) *CustomRegistry {
 	return &CustomRegistry{
-		Helm:     helm,
+		Client:   helm,
 		registry: registry,
 	}
 }