Fix tests so that they always retrieve the right secret.

k8ssandra · Dec 13, 2023 · 6ab0e17 · 6ab0e17
1 parent ce86d76
commit 6ab0e17
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/test/e2e/medusa_test.go b/test/e2e/medusa_test.go
@@ -198,8 +198,17 @@ func verifyRestoreJobFinished(t *testing.T, ctx context.Context, f *framework.E2
 	}, polling.medusaRestoreDone.timeout, polling.medusaRestoreDone.interval, "restore didn't finish within timeout")
 
 	require.Eventually(func() bool {
+		dc := &cassdcapi.CassandraDatacenter{}
+		err := f.Get(ctx, dcKey, dc)
+		if err != nil {
+			t.Log(err)
+		}
+		superUserSecret := dc.Spec.SuperuserSecretName
+		if dc.Spec.SuperuserSecretName == "" {
+			superUserSecret = cassdcapi.CleanupForKubernetes(dcKey.Name) + "-superuser"
+		}
 		secret := &corev1.Secret{}
-		err := f.Get(ctx, framework.NewClusterKey(restoreClusterKey.K8sContext, restoreClusterKey.Namespace, "test-superuser"), secret)
+		err = f.Get(ctx, framework.NewClusterKey(restoreClusterKey.K8sContext, restoreClusterKey.Namespace, superUserSecret), secret)
 		if err != nil {
 			t.Log(err)
 			return false