Bump CAPI operator chart version to 0.8.1

Signed-off-by: Danil Grigorev <danil.grigorev@suse.com>
rancher · Jan 17, 2024 · b128d78 · b128d78
1 parent 6fac580
commit b128d78
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 18 deletions.
diff --git a/charts/rancher-turtles/Chart.yaml b/charts/rancher-turtles/Chart.yaml
@@ -13,7 +13,7 @@ keywords:
 - provisioning
 dependencies:
   - name: cluster-api-operator
-    version: v0.6.0
+    version: v0.8.1
     repository: https://kubernetes-sigs.github.io/cluster-api-operator
     condition: cluster-api-operator.enabled
 annotations:

diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/cluster-api v1.6.0
-	sigs.k8s.io/cluster-api-operator v0.8.0
+	sigs.k8s.io/cluster-api-operator v0.8.1
 	sigs.k8s.io/controller-runtime v0.16.3
 )
 

diff --git a/go.sum b/go.sum
@@ -254,8 +254,8 @@ k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSn
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/cluster-api v1.6.0 h1:2bhVSnUbtWI8taCjd9lGiHExsRUpKf7Z1fXqi/IwYx4=
 sigs.k8s.io/cluster-api v1.6.0/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
-sigs.k8s.io/cluster-api-operator v0.8.0 h1:LyX+8LYElGcs0Mb7bFHJs6sfhvOfnhKKM896w1SVV+g=
-sigs.k8s.io/cluster-api-operator v0.8.0/go.mod h1:oXh+VDIon19TVIeMYAhEqZTtdEW6dXwO1F75EoZVj8I=
+sigs.k8s.io/cluster-api-operator v0.8.1 h1:4aSAQAUcOZtuGBYYTULZqx7gsifWsUNsOXAS3hwmYCM=
+sigs.k8s.io/cluster-api-operator v0.8.1/go.mod h1:oXh+VDIon19TVIeMYAhEqZTtdEW6dXwO1F75EoZVj8I=
 sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
 sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

diff --git a/internal/controllers/capiprovider_controller.go b/internal/controllers/capiprovider_controller.go
@@ -72,7 +72,7 @@ func (r *CAPIProviderReconciler) sync(ctx context.Context, capiProvider *turtles
 	s := sync.List{
 		sync.NewProviderSync(r.Client, capiProvider),
 		sync.NewSecretSync(r.Client, capiProvider),
-		sync.NewSecretMapperSync(r.Client, capiProvider),
+		sync.NewSecretMapperSync(ctx, r.Client, capiProvider),
 	}
 
 	if err := s.Sync(ctx); client.IgnoreNotFound(err) != nil {

diff --git a/internal/sync/secret_mapper_sync.go b/internal/sync/secret_mapper_sync.go
@@ -189,10 +189,13 @@ type SecretMapperSync struct {
 }
 
 // NewSecretMapperSync creates a new secret mapper object sync.
-func NewSecretMapperSync(cl client.Client, capiProvider *turtlesv1.CAPIProvider) Sync {
+func NewSecretMapperSync(ctx context.Context, cl client.Client, capiProvider *turtlesv1.CAPIProvider) Sync {
+	log := log.FromContext(ctx)
+
 	if capiProvider.Spec.Credentials == nil ||
 		capiProvider.Spec.Credentials.RancherCloudCredential == "" ||
 		knownProviderRequirements[capiProvider.Spec.Name] == nil {
+		log.V(6).Info("No rancher credentials source provided, skipping.")
 		return nil
 	}
 

diff --git a/internal/sync/secret_mapper_sync_test.go b/internal/sync/secret_mapper_sync_test.go
@@ -194,7 +194,7 @@ var _ = Describe("SecretMapperSync get", func() {
 		capiProvider.Spec.Name = "azure"
 		rancherSecret.Annotations[sync.DriverNameAnnotation] = "azure"
 		Expect(testEnv.Client.Create(ctx, rancherSecret)).ToNot(HaveOccurred())
-		syncer := sync.NewSecretMapperSync(testEnv, capiProvider).(*sync.SecretMapperSync)
+		syncer := sync.NewSecretMapperSync(ctx, testEnv, capiProvider).(*sync.SecretMapperSync)
 
 		err := syncer.Sync(context.Background())
 		Expect(err).ToNot(HaveOccurred())
@@ -218,7 +218,7 @@ var _ = Describe("SecretMapperSync get", func() {
 	It("provider requirements aws", func() {
 		capiProvider.Spec.Name = "aws"
 		rancherSecret.Annotations[sync.DriverNameAnnotation] = "aws"
-		syncer := sync.NewSecretMapperSync(testEnv, capiProvider).(*sync.SecretMapperSync)
+		syncer := sync.NewSecretMapperSync(ctx, testEnv, capiProvider).(*sync.SecretMapperSync)
 		syncer.RancherSecret = rancherSecret
 
 		err := syncer.Sync(context.Background())
@@ -240,7 +240,7 @@ var _ = Describe("SecretMapperSync get", func() {
 		capiProvider.Spec.Name = "gcp"
 		rancherSecret.Annotations[sync.DriverNameAnnotation] = "gcp"
 		Expect(testEnv.Client.Create(ctx, rancherSecret)).ToNot(HaveOccurred())
-		syncer := sync.NewSecretMapperSync(testEnv, capiProvider).(*sync.SecretMapperSync)
+		syncer := sync.NewSecretMapperSync(ctx, testEnv, capiProvider).(*sync.SecretMapperSync)
 
 		err := syncer.Sync(context.Background())
 		Expect(err).ToNot(HaveOccurred())
@@ -257,7 +257,7 @@ var _ = Describe("SecretMapperSync get", func() {
 		capiProvider.Spec.Name = "digitalocean"
 		rancherSecret.Annotations[sync.DriverNameAnnotation] = "digitalocean"
 		Expect(testEnv.Client.Create(ctx, rancherSecret)).ToNot(HaveOccurred())
-		syncer := sync.NewSecretMapperSync(testEnv, capiProvider).(*sync.SecretMapperSync)
+		syncer := sync.NewSecretMapperSync(ctx, testEnv, capiProvider).(*sync.SecretMapperSync)
 
 		err := syncer.Sync(context.Background())
 		Expect(err).ToNot(HaveOccurred())
@@ -275,7 +275,7 @@ var _ = Describe("SecretMapperSync get", func() {
 		capiProvider.Spec.Name = "vsphere"
 		rancherSecret.Annotations[sync.DriverNameAnnotation] = "vmwarevsphere"
 		Expect(testEnv.Client.Create(ctx, rancherSecret)).ToNot(HaveOccurred())
-		syncer := sync.NewSecretMapperSync(testEnv, capiProvider).(*sync.SecretMapperSync)
+		syncer := sync.NewSecretMapperSync(ctx, testEnv, capiProvider).(*sync.SecretMapperSync)
 
 		err := syncer.Sync(context.Background())
 		Expect(err).ToNot(HaveOccurred())
@@ -299,7 +299,7 @@ var _ = Describe("SecretMapperSync get", func() {
 		}
 		Expect(testEnv.Client.Create(ctx, rancherSecret)).ToNot(HaveOccurred())
 
-		syncer := sync.NewSecretMapperSync(testEnv, capiProvider).(*sync.SecretMapperSync)
+		syncer := sync.NewSecretMapperSync(ctx, testEnv, capiProvider).(*sync.SecretMapperSync)
 
 		Expect(syncer.Get(context.Background())).ToNot(HaveOccurred())
 		Expect(syncer.RancherSecret.Data["amazonec2credentialConfig-defaultRegion"]).ToNot(BeEmpty())

diff --git a/test/go.mod b/test/go.mod
@@ -17,8 +17,8 @@ require (
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/cluster-api v1.6.0
-	sigs.k8s.io/cluster-api-operator v0.8.0
-	sigs.k8s.io/cluster-api-operator/test v0.8.0
+	sigs.k8s.io/cluster-api-operator v0.8.1
+	sigs.k8s.io/cluster-api-operator/test v0.8.1
 	sigs.k8s.io/cluster-api/test v1.6.0
 	sigs.k8s.io/controller-runtime v0.16.3
 	sigs.k8s.io/yaml v1.4.0

diff --git a/test/go.sum b/test/go.sum
@@ -806,10 +806,10 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/cluster-api v1.6.0 h1:2bhVSnUbtWI8taCjd9lGiHExsRUpKf7Z1fXqi/IwYx4=
 sigs.k8s.io/cluster-api v1.6.0/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
-sigs.k8s.io/cluster-api-operator v0.8.0 h1:LyX+8LYElGcs0Mb7bFHJs6sfhvOfnhKKM896w1SVV+g=
-sigs.k8s.io/cluster-api-operator v0.8.0/go.mod h1:oXh+VDIon19TVIeMYAhEqZTtdEW6dXwO1F75EoZVj8I=
-sigs.k8s.io/cluster-api-operator/test v0.8.0 h1:rTvKAEoJeKzbmY9uOMDjuIynzhlOGb1I+PKc/EAiBm8=
-sigs.k8s.io/cluster-api-operator/test v0.8.0/go.mod h1:wdn34LbI3MbXYyQ0n25ZF797wRIclIMS8ZVepuyHJG0=
+sigs.k8s.io/cluster-api-operator v0.8.1 h1:4aSAQAUcOZtuGBYYTULZqx7gsifWsUNsOXAS3hwmYCM=
+sigs.k8s.io/cluster-api-operator v0.8.1/go.mod h1:oXh+VDIon19TVIeMYAhEqZTtdEW6dXwO1F75EoZVj8I=
+sigs.k8s.io/cluster-api-operator/test v0.8.1 h1:xiqPYVydr8l/u8+Ep+41B3T/qVxfyrFHjQMVX5YE/3c=
+sigs.k8s.io/cluster-api-operator/test v0.8.1/go.mod h1:wdn34LbI3MbXYyQ0n25ZF797wRIclIMS8ZVepuyHJG0=
 sigs.k8s.io/cluster-api/test v1.6.0 h1:hvqUpSYxXCvs4FiEfsDpFZAfZ7i4kkP/59mVdFHlzSI=
 sigs.k8s.io/cluster-api/test v1.6.0/go.mod h1:DJtbkrnrH77cd3PnXeKCQDMtCGVCrHZHPOjMvEsLB2U=
 sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=