Skip to content

Commit d24e3de

Browse files
black-dragon74mergify[bot]
authored andcommitted
e2e: use userID and userKey in cephfs tests
This patch removes the deprecated `adminID` and `adminKey` in favor of `userID` and `userKey` in the CephFS e2e tests. Signed-off-by: Niraj Yadav <niryadav@redhat.com>
1 parent 5731718 commit d24e3de

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

e2e/cephfs_helper.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,8 @@ func createCephfsSecret(f *framework.Framework, secretName, userName, userKey st
167167
if secretName != "" {
168168
sc.Name = secretName
169169
}
170-
// TODO: Update the secrets to use userID and userKey once
171-
// the version used for upgrade testing does not depend on
172-
// adminID and adminKey.
173-
sc.StringData["adminID"] = userName
174-
sc.StringData["adminKey"] = userKey
175-
delete(sc.StringData, "userID")
176-
delete(sc.StringData, "userKey")
170+
sc.StringData["userID"] = userName
171+
sc.StringData["userKey"] = userKey
177172
sc.Namespace = cephCSINamespace
178173
_, err = f.ClientSet.CoreV1().Secrets(cephCSINamespace).Create(context.TODO(), &sc, metav1.CreateOptions{})
179174

0 commit comments

Comments
 (0)