diff --git a/pkg/operator/ceph/controller/cluster_info.go b/pkg/operator/ceph/controller/cluster_info.go index eb85146ad..e9f3d8eb9 100644 --- a/pkg/operator/ceph/controller/cluster_info.go +++ b/pkg/operator/ceph/controller/cluster_info.go @@ -141,6 +141,9 @@ func CreateOrLoadClusterInfo(clusterdContext *clusterd.Context, context context. } else { return nil, maxMonID, monMapping, errors.New("failed to find either the cluster admin key or the username") } + if len(secrets.OwnerReferences) > 0 { + clusterInfo.OwnerInfo = k8sutil.NewOwnerInfoWithOwnerRef(&secrets.GetOwnerReferences()[0], namespace) + } logger.Debugf("found existing monitor secrets for cluster %s", clusterInfo.Namespace) } diff --git a/pkg/operator/ceph/controller/cluster_info_test.go b/pkg/operator/ceph/controller/cluster_info_test.go index 7b7695553..cdfa02913 100644 --- a/pkg/operator/ceph/controller/cluster_info_test.go +++ b/pkg/operator/ceph/controller/cluster_info_test.go @@ -29,6 +29,7 @@ import ( exectest "github.com/rook/rook/pkg/util/exec/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -74,6 +75,36 @@ func TestCreateClusterSecrets(t *testing.T) { assert.NoError(t, err) assert.Equal(t, adminSecret, string(secret.Data["ceph-secret"])) + // ensure secret owner info can be loaded and is useful + // this is what the owner info looks like in a live cluster + ownerController := true + blockOwnerDel := true + secret.OwnerReferences[0] = metav1.OwnerReference{ + APIVersion: "ceph.rook.io/v1", + Kind: "CephCluster", + Name: "my-cluster", + UID: "e55604f2-710c-4353-9a3e-9d23ea2d6eb9", // random uuid + Controller: &ownerController, + BlockOwnerDeletion: &blockOwnerDel, + } + _, err = clientset.CoreV1().Secrets(namespace).Update(ctx, secret, metav1.UpdateOptions{}) + assert.NoError(t, err) + info, _, _, err = CreateOrLoadClusterInfo(context, ctx, namespace, ownerInfo, cephClusterSpec) + assert.NoError(t, err) + // use the SetOwnerReference() method to ensure that the loaded OwnerInfo is usable and correct + cm := corev1.ConfigMap{} + cm.Name = "bob" + cm.Namespace = namespace + err = info.OwnerInfo.SetOwnerReference(&cm) + assert.NoError(t, err) + cmOwner := cm.OwnerReferences[0] + assert.Equal(t, "ceph.rook.io/v1", cmOwner.APIVersion) + assert.Equal(t, "CephCluster", cmOwner.Kind) + assert.Equal(t, "my-cluster", cmOwner.Name) + assert.Equal(t, "e55604f2-710c-4353-9a3e-9d23ea2d6eb9", string(cmOwner.UID)) + assert.True(t, *cmOwner.Controller) + assert.True(t, *cmOwner.BlockOwnerDeletion) + // For backward compatibility check that the admin secret can be loaded as previously specified // Update the secret as if created in an old cluster delete(secret.Data, CephUserSecretKey)