Merge pull request #598 from Danil-Grigorev/clusterctl-image-overrides

✨ Pass image overrides to in-memory client

Author: k8s-ci-robot

internal/controller/manifests_downloader_test.go

@@ -22,6 +22,8 @@ import (
 
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
+	configclient "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	operatorv1 "sigs.k8s.io/cluster-api-operator/api/v1alpha2"
@@ -34,14 +36,12 @@ func TestManifestsDownloader(t *testing.T) {
 
 	fakeclient := fake.NewClientBuilder().WithObjects().Build()
 
-	namespace := "test-namespace"
-
 	p := &phaseReconciler{
 		ctrlClient: fakeclient,
 		provider: &operatorv1.CoreProvider{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "cluster-api",
-				Namespace: namespace,
+				Namespace: "test-namespace",
 			},
 			Spec: operatorv1.CoreProviderSpec{
 				ProviderSpec: operatorv1.ProviderSpec{
@@ -67,3 +67,52 @@ func TestManifestsDownloader(t *testing.T) {
 
 	g.Expect(exists).To(BeTrue())
 }
+
+func TestProviderDownloadWithOverrides(t *testing.T) {
+	g := NewWithT(t)
+
+	ctx := context.Background()
+
+	fakeclient := fake.NewClientBuilder().WithObjects().Build()
+
+	namespace := "test-namespace"
+
+	reader := configclient.NewMemoryReader()
+	_, err := reader.AddProvider("cluster-api", clusterctlv1.CoreProviderType, "https://github.com/kubernetes-sigs/cluster-api/releases/v1.4.3/core-components.yaml")
+	g.Expect(err).ToNot(HaveOccurred())
+
+	overridesClient, err := configclient.New(ctx, "", configclient.InjectReader(reader))
+	g.Expect(err).ToNot(HaveOccurred())
+
+	overridesClient.Variables().Set("images", `
+all:
+  repository: "myorg.io/local-repo"
+`)
+
+	p := &phaseReconciler{
+		ctrlClient: fakeclient,
+		provider: &operatorv1.CoreProvider{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "cluster-api",
+				Namespace: namespace,
+			},
+			Spec: operatorv1.CoreProviderSpec{},
+		},
+		overridesClient: overridesClient,
+	}
+
+	_, err = p.initializePhaseReconciler(ctx)
+	g.Expect(err).ToNot(HaveOccurred())
+
+	_, err = p.downloadManifests(ctx)
+	g.Expect(err).ToNot(HaveOccurred())
+
+	_, err = p.load(ctx)
+	g.Expect(err).ToNot(HaveOccurred())
+
+	_, err = p.fetch(ctx)
+	g.Expect(err).ToNot(HaveOccurred())
+
+	g.Expect(p.components.Images()).To(HaveExactElements([]string{"myorg.io/local-repo/cluster-api-controller:v1.4.3"}))
+	g.Expect(p.components.Version()).To(Equal("v1.4.3"))
+}

internal/controller/phases.go

@@ -65,6 +65,7 @@ type phaseReconciler struct {
 	options            repository.ComponentsOptions
 	providerConfig     configclient.Provider
 	configClient       configclient.Client
+	overridesClient    configclient.Client
 	components         repository.Components
 	clusterctlProvider *clusterctlv1.Provider
 }
@@ -126,18 +127,33 @@ func (p *phaseReconciler) initializePhaseReconciler(ctx context.Context) (reconc
 	initConfig, err := configclient.New(ctx, path)
 	if err != nil {
 		return reconcile.Result{}, err
+	} else if path != "" {
+		// Set the image and providers override client
+		p.overridesClient = initConfig
 	}
 
-	providers, err := initConfig.Providers().List()
-	if err != nil {
-		return reconcile.Result{}, err
+	overrideProviders := []configclient.Provider{}
+
+	if p.overridesClient != nil {
+		providers, err := p.overridesClient.Providers().List()
+		if err != nil {
+			return reconcile.Result{}, err
+		}
+
+		overrideProviders = providers
 	}
 
-	reader, err := p.secretReader(ctx, providers...)
+	reader, err := p.secretReader(ctx, overrideProviders...)
 	if err != nil {
 		return reconcile.Result{}, err
 	}
 
+	if p.overridesClient != nil {
+		if imageOverrides, err := p.overridesClient.Variables().Get("images"); err == nil {
+			reader.Set("images", imageOverrides)
+		}
+	}
+
 	// Load provider's secret and config url.
 	p.configClient, err = configclient.New(ctx, "", configclient.InjectReader(reader))
 	if err != nil {