cephfs: use userid and keys for provisioning

This patch modifies the code to use userID and userKey for provisioning of both static and dynamic PVs. In case user credentials are not found admin credentials are used as a fallback and for backwards compatibility. Signed-off-by: Niraj Yadav <[email protected]>
ceph · Nov 27, 2024 · 3b74c01 · 3b74c01
1 parent 630c97a
commit 3b74c01
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/e2e/cephfs_helper.go b/e2e/cephfs_helper.go
@@ -127,10 +127,10 @@ func createCephfsSecret(f *framework.Framework, secretName, userName, userKey st
 	if secretName != "" {
 		sc.Name = secretName
 	}
-	sc.StringData["adminID"] = userName
-	sc.StringData["adminKey"] = userKey
-	delete(sc.StringData, "userID")
-	delete(sc.StringData, "userKey")
+	sc.StringData["userID"] = userName
+	sc.StringData["userKey"] = userKey
+	delete(sc.StringData, "adminID")
+	delete(sc.StringData, "adminKey")
 	sc.Namespace = cephCSINamespace
 	_, err = f.ClientSet.CoreV1().Secrets(cephCSINamespace).Create(context.TODO(), &sc, metav1.CreateOptions{})
 

diff --git a/internal/util/credentials.go b/internal/util/credentials.go
@@ -110,6 +110,11 @@ func NewUserCredentials(secrets map[string]string) (*Credentials, error) {
 
 // NewAdminCredentials creates new admin credentials from secret.
 func NewAdminCredentials(secrets map[string]string) (*Credentials, error) {
+	// Use userID and userKey if found else fallback to adminID and adminKey
+	if cred, err := newCredentialsFromSecret(credUserID, credUserKey, secrets); err == nil {
+		return cred, nil
+	}
+
 	return newCredentialsFromSecret(credAdminID, credAdminKey, secrets)
 }