ss: use secretstore namespace

ContainerSolutions · Oct 30, 2020 · a0b958b · a0b958b
1 parent 0e8ead8
commit a0b958b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/controllers/store/secretstore_controller.go b/controllers/store/secretstore_controller.go
@@ -84,11 +84,10 @@ func (r *SecretStoreReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error)
 
 	secretRef := config.Auth["secretRef"].(map[string]interface{})
 	secretRefName := secretRef["name"].(string)
-	secretRefNamespace := secretRef["namespace"].(string)
 
 	// Fetch credential Secret
 	credentialsSecret := &corev1.Secret{}
-	err = r.Get(ctx, types.NamespacedName{Name: secretRefName, Namespace: secretRefNamespace}, credentialsSecret)
+	err = r.Get(ctx, types.NamespacedName{Name: secretRefName, Namespace: secretStore.Namespace}, credentialsSecret)
 	if err != nil {
 		// Error reading the object - requeue the request.
 		log.Error(err, "Failed to get credentials Secret")

diff --git a/controllers/store/secretstore_controller_test.go b/controllers/store/secretstore_controller_test.go
@@ -37,8 +37,7 @@ var _ = Describe("SecretstoreController", func() {
 			"type": "dummy",
 			"auth": {
 				"secretRef": {
-					"name": "credential-secret-store",
-					"namespace": "default"
+					"name": "credential-secret-store"
 				}
 			},
 			"parameters": {
@@ -162,8 +161,7 @@ var _ = Describe("SecretstoreController", func() {
 			"type": "dummy",
 			"auth": {
 				"secretRef": {
-					"name": "credential-secret-non-existent",
-					"namespace": "default"
+					"name": "credential-secret-non-existent"
 				}
 			},
 			"parameters": {
@@ -216,8 +214,7 @@ var _ = Describe("SecretstoreController", func() {
 			"type": "dummy",
 			"auth": {
 				"secretRef": {
-					"name": "credential-secret-store",
-					"namespace": "default"
+					"name": "credential-secret-store"
 				}
 			},
 			"parameters": {}