core: include userID/userKey to secret generated from CephClient

Adding two new entries(userID/userKey) in the cephClient secret, so that the csi driver can easily consume

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
This commit is contained in:
Avan Thakkar committed 2022-11-08 15:41:26 +05:30
1 parent c67c33f1d3
commit 47df5c37cd
2 files changed
+10

No files matched your search

+6
View File
@@ -257,6 +257,12 @@ func (r *ReconcileCephClient) createOrUpdateClient(cephClient *cephv1.CephClient
},
StringData: map[string]string{
cephClient.Name: key,
// CSI requires userID and userKey for RBD
"userID": cephClient.Name,
"userKey": key,
// CSI requires adminID and adminKey for CephFS
"adminID": cephClient.Name,
"adminKey": key,
},
Type: k8sutil.RookType,
}
@@ -295,6 +295,10 @@ func TestCephClientController(t *testing.T) {
cephClientSecret, err := c.Clientset.CoreV1().Secrets(namespace).Get(ctx, cephClient.Status.Info["secretName"], metav1.GetOptions{})
assert.NoError(t, err)
assert.NotEmpty(t, cephClientSecret.StringData)
assert.Contains(t, cephClientSecret.StringData, "userID")
assert.Contains(t, cephClientSecret.StringData, "userKey")
assert.Contains(t, cephClientSecret.StringData, "adminID")
assert.Contains(t, cephClientSecret.StringData, "adminKey")
}
func TestBuildUpdateStatusInfo(t *testing.T) {