handle the case where the accessKeyRef namespace is nil

Author: AshleyDumaine

cloud/scope/object_storage_bucket.go

@@ -134,9 +134,14 @@ func (s *ObjectStorageBucketScope) getAccessKey(ctx context.Context) (*infrav1al
 		return nil, fmt.Errorf("accessKeyRef is nil for bucket %s", s.Bucket.Name)
 	}
 
+	objKeyNamespace := s.Bucket.Spec.AccessKeyRef.Namespace
+	if s.Bucket.Spec.AccessKeyRef.Namespace == "" {
+		objKeyNamespace = s.Bucket.Namespace
+	}
+
 	objKey := client.ObjectKey{
 		Name:      s.Bucket.Spec.AccessKeyRef.Name,
-		Namespace: s.Bucket.Spec.AccessKeyRef.Namespace,
+		Namespace: objKeyNamespace,
 	}
 	if s.Bucket.Spec.AccessKeyRef.Namespace == "" {
 		s.Bucket.Spec.AccessKeyRef.Namespace = s.Bucket.GetNamespace()

internal/controller/linodeobjectstoragebucket_controller_test.go

@@ -56,6 +56,9 @@ var _ = Describe("lifecycle", Ordered, Label("bucket", "lifecycle"), func() {
 		},
 		Spec: infrav1alpha2.LinodeObjectStorageBucketSpec{
 			Region: "region",
+			AccessKeyRef: &corev1.ObjectReference{
+				Name: "lifecycle-mgmt",
+			},
 		},
 	}
 
@@ -136,6 +139,8 @@ var _ = Describe("lifecycle", Ordered, Label("bucket", "lifecycle"), func() {
 				Result("resource status is updated", func(ctx context.Context, mck Mock) {
 					objectKey := client.ObjectKeyFromObject(&obj)
 					bScope.LinodeClient = mck.LinodeClient
+					tmpClient := bScope.Client
+					bScope.Client = k8sClient
 					_, err := reconciler.reconcile(ctx, &bScope)
 					Expect(err).NotTo(HaveOccurred())
 
@@ -154,6 +159,8 @@ var _ = Describe("lifecycle", Ordered, Label("bucket", "lifecycle"), func() {
 
 					logOutput := mck.Logs()
 					Expect(logOutput).To(ContainSubstring("Reconciling apply"))
+
+					bScope.Client = tmpClient
 				}),
 			),
 			Path(