Add e2e test for Medusa against DSE

k8ssandra · Sep 20, 2023 · c3a10a4 · c3a10a4
1 parent 6154bc3
commit c3a10a4
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 9 deletions.
diff --git a/.github/workflows/kind_e2e_tests.yaml b/.github/workflows/kind_e2e_tests.yaml
@@ -82,6 +82,7 @@ jobs:
           - CreateSingleReaper
           - CreateReaperAndDatacenter
           - CreateSingleMedusaJob
+          - CreateSingleDseMedusaJob
           - ConfigControllerRestarts
           # TODO: these e2e tests started breaking after new client certificates were added. Needs fixing.
           #- SingleDcEncryptionWithStargate

diff --git a/CHANGELOG/CHANGELOG-1.9.md b/CHANGELOG/CHANGELOG-1.9.md
@@ -26,3 +26,4 @@ When cutting a new release, update the `unreleased` heading to the tag being gen
 * [BUGFIX] [#1017](https://github.com/k8ssandra/k8ssandra-operator/issues/1017) Fix MedusaTask to delete only its own backups
 * [DOCS] [#1019](https://github.com/k8ssandra/k8ssandra-operator/issues/1019) Add PR review guidelines documentation
 * [TESTING] [#1037](https://github.com/k8ssandra/k8ssandra-operator/issues/1037) Add non regression test for Medusa issue with scale up after a restore
+* [TESTING] [#1037](https://github.com/k8ssandra/k8ssandra-operator/issues/1037) Add e2e test for Medusa against DSE
diff --git a/test/e2e/medusa_test.go b/test/e2e/medusa_test.go
@@ -42,14 +42,17 @@ func createSingleMedusaJob(t *testing.T, ctx context.Context, namespace string,
 	verifyRestoreJobFinished(t, ctx, f, dcKey, backupKey)
 
 	// Scale the cluster to verify that the previous restore won't break the new pod
-	t.Log("Scaling the cluster to 3 nodes")
-	err = f.Get(ctx, kcKey, kc)
-	require.NoError(err, "Error getting the K8ssandraCluster")
-	kcPatch := client.MergeFromWithOptions(kc.DeepCopy(), client.MergeFromWithOptimisticLock{})
-	kc.Spec.Cassandra.Datacenters[0].Size = 3
-	err = f.Client.Patch(ctx, kc, kcPatch)
-	require.NoError(err, "Error scaling the cluster")
-	checkDatacenterReady(t, ctx, dcKey, f)
+	// Not doing this for DSE tests as it takes too long
+	if kc.Spec.Cassandra.ServerType == "cassandra" {
+		t.Log("Scaling the cluster to 3 nodes")
+		err = f.Get(ctx, kcKey, kc)
+		require.NoError(err, "Error getting the K8ssandraCluster")
+		kcPatch := client.MergeFromWithOptions(kc.DeepCopy(), client.MergeFromWithOptimisticLock{})
+		kc.Spec.Cassandra.Datacenters[0].Size = 3
+		err = f.Client.Patch(ctx, kc, kcPatch)
+		require.NoError(err, "Error scaling the cluster")
+		checkDatacenterReady(t, ctx, dcKey, f)
+	}
 }
 
 func createMultiMedusaJob(t *testing.T, ctx context.Context, namespace string, f *framework.E2eFramework) {

diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
@@ -276,6 +276,13 @@ func TestOperator(t *testing.T) {
 		doCassandraDatacenterCleanup: false,
 		installMinio:                 true,
 	}))
+	t.Run("CreateSingleDseMedusaJob", e2eTest(ctx, &e2eTestOpts{
+		testFunc:                     createSingleMedusaJob,
+		fixture:                      framework.NewTestFixture("single-dc-dse-medusa", controlPlane),
+		skipK8ssandraClusterCleanup:  false,
+		doCassandraDatacenterCleanup: false,
+		installMinio:                 true,
+	}))
 	t.Run("CreateMultiMedusaJob", e2eTest(ctx, &e2eTestOpts{
 		testFunc:                     createMultiMedusaJob,
 		fixture:                      framework.NewTestFixture("multi-dc-encryption-medusa", controlPlane),
@@ -680,7 +687,7 @@ func applyPollingDefaults() {
 	polling.reaperReady.timeout = 10 * time.Minute
 	polling.reaperReady.interval = 15 * time.Second
 
-	polling.medusaBackupDone.timeout = 2 * time.Minute
+	polling.medusaBackupDone.timeout = 5 * time.Minute
 	polling.medusaBackupDone.interval = 5 * time.Second
 
 	polling.medusaRestoreDone.timeout = 10 * time.Minute

diff --git a/test/testdata/fixtures/single-dc-dse-medusa/k8ssandra.yaml b/test/testdata/fixtures/single-dc-dse-medusa/k8ssandra.yaml
@@ -0,0 +1,35 @@
+apiVersion: k8ssandra.io/v1alpha1
+kind: K8ssandraCluster
+metadata:
+  name: test
+spec:
+  medusa:
+    storageProperties:
+      storageProvider: s3_compatible
+      bucketName: k8ssandra-medusa
+      prefix: test
+      storageSecretRef:
+        name: medusa-bucket-key
+      host: minio-service.minio.svc.cluster.local
+      port: 9000
+      secure: false 
+  cassandra:
+    clusterName: "First Cluster"
+    serverVersion: 6.8.36
+    serverType: dse
+    datacenters:
+      - metadata:
+          name: dc1
+        k8sContext: kind-k8ssandra-0
+        size: 2
+        storageConfig:
+          cassandraDataVolumeClaimSpec:
+            storageClassName: standard
+            accessModes:
+              - ReadWriteOnce
+            resources:
+              requests:
+                storage: 5Gi
+        config:
+          jvmOptions:
+            heapSize: 512Mi
diff --git a/test/testdata/fixtures/single-dc-dse-medusa/kustomization.yaml b/test/testdata/fixtures/single-dc-dse-medusa/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - k8ssandra.yaml