Skip to content

✨ Pass image overrides to in-memory client #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2024
Merged

✨ Pass image overrides to in-memory client #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 52 additions & 3 deletions internal/controller/manifests_downloader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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{
Expand All @@ -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"))
}
24 changes: 20 additions & 4 deletions internal/controller/phases.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

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 {
Expand Down
Loading