diff --git a/pkg/medusa/reconcile.go b/pkg/medusa/reconcile.go index f7950231d..8fa5ecfe9 100644 --- a/pkg/medusa/reconcile.go +++ b/pkg/medusa/reconcile.go @@ -25,7 +25,7 @@ const ( DefaultMedusaImageRepository = "k8ssandra" DefaultMedusaImageName = "medusa" // DefaultMedusaVersion pins to an unreleased version to be compatible. will revert back to a release version once we have it - DefaultMedusaVersion = "2e5723d-tmp" + DefaultMedusaVersion = "75d7873-tmp" DefaultMedusaPort = 50051 DefaultProbeInitialDelay = 10 DefaultProbeTimeout = 1 diff --git a/test/e2e/dse_test.go b/test/e2e/dse_test.go index 9a82200bc..ada87ecd5 100644 --- a/test/e2e/dse_test.go +++ b/test/e2e/dse_test.go @@ -100,6 +100,21 @@ func createSingleDseSearchDatacenterCluster(t *testing.T, ctx context.Context, n require.Eventually(t, func() bool { return testSolrEndpoint(t, solrHostAndPort, username, password) }, 2*time.Minute, 10*time.Second, "failed to reach solr endpoint") + + kc := &api.K8ssandraCluster{} + backupKey := types.NamespacedName{Namespace: namespace, Name: backupName} + + checkDatacenterReady(t, ctx, dcKey, f) + checkMedusaContainersExist(t, ctx, namespace, dcKey, f, kc) + createBackupJob(t, ctx, namespace, f, dcKey) + verifyBackupJobFinished(t, ctx, f, dcKey, backupKey) + restoreBackupJob(t, ctx, namespace, f, dcKey) + verifyRestoreJobFinished(t, ctx, f, dcKey, backupKey) + + require.Eventually(t, func() bool { + return testSolrEndpoint(t, solrHostAndPort, username, password) + }, 2*time.Minute, 10*time.Second, "failed to reach solr endpoint") + } func basicAuth(username, password string) string { diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go index e290a35c8..7db9e5761 100644 --- a/test/e2e/suite_test.go +++ b/test/e2e/suite_test.go @@ -185,9 +185,10 @@ func TestOperator(t *testing.T) { dse: true, })) t.Run("CreateSingleDseSearchDatacenterCluster", e2eTest(ctx, &e2eTestOpts{ - testFunc: createSingleDseSearchDatacenterCluster, - fixture: framework.NewTestFixture("single-dc-dse-search", controlPlane), - dse: true, + testFunc: createSingleDseSearchDatacenterCluster, + fixture: framework.NewTestFixture("single-dc-dse-search", controlPlane), + dse: true, + installMinio: true, })) t.Run("CreateSingleDseGraphDatacenterCluster", e2eTest(ctx, &e2eTestOpts{ testFunc: createSingleDseGraphDatacenterCluster, diff --git a/test/testdata/fixtures/single-dc-dse-search/k8ssandra.yaml b/test/testdata/fixtures/single-dc-dse-search/k8ssandra.yaml index 3d8022eee..d70ea61fb 100644 --- a/test/testdata/fixtures/single-dc-dse-search/k8ssandra.yaml +++ b/test/testdata/fixtures/single-dc-dse-search/k8ssandra.yaml @@ -3,6 +3,18 @@ kind: K8ssandraCluster metadata: name: test spec: + medusa: + containerImage: + tag: + 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: serverVersion: 6.8.26 serverType: dse