Delete controller flag for baremetalhost for secret

Secret may be shared across the several baremetal hosts. Delete the controller flag which have been resricted the share.
metal3-io · Sep 7, 2022 · 8550d61 · 8550d61
1 parent 9b26aa7
commit 8550d61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/controllers/metal3.io/baremetalhost_controller.go b/controllers/metal3.io/baremetalhost_controller.go
@@ -1489,7 +1489,7 @@ func (r *BareMetalHostReconciler) getBMCSecretAndSetOwner(request ctrl.Request,
 	reqLogger := r.Log.WithValues("baremetalhost", request.NamespacedName)
 	secretManager := r.secretManager(reqLogger)
 
-	bmcCredsSecret, err := secretManager.AcquireSecret(host.CredentialsKey(), host, true, host.Status.Provisioning.State != metal3v1alpha1.StateDeleting)
+	bmcCredsSecret, err := secretManager.AcquireSecret(host.CredentialsKey(), host, false, host.Status.Provisioning.State != metal3v1alpha1.StateDeleting)
 	if err != nil {
 		if k8serrors.IsNotFound(err) {
 			return nil, &ResolveBMCSecretRefError{message: fmt.Sprintf("The BMC secret %s does not exist", host.CredentialsKey())}

diff --git a/controllers/metal3.io/baremetalhost_controller_test.go b/controllers/metal3.io/baremetalhost_controller_test.go
@@ -764,9 +764,8 @@ func TestSecretUpdateOwnerRefAndEnvironmentLabelOnStartup(t *testing.T) {
 	secret = getHostSecret(t, r, host)
 	assert.Equal(t, host.Name, secret.OwnerReferences[0].Name)
 	assert.Equal(t, "BareMetalHost", secret.OwnerReferences[0].Kind)
-	assert.True(t, *secret.OwnerReferences[0].Controller)
-	assert.True(t, *secret.OwnerReferences[0].BlockOwnerDeletion)
-
+	assert.Nil(t, secret.OwnerReferences[0].Controller)
+	assert.Nil(t, secret.OwnerReferences[0].BlockOwnerDeletion)
 	assert.Equal(t, "baremetal", secret.Labels["environment.metal3.io"])
 
 }