From 785fc1b90f189c7ad5fed67765b9628468ad5ead Mon Sep 17 00:00:00 2001 From: Miles Garnsey Date: Thu, 19 Oct 2023 06:40:39 -0700 Subject: [PATCH] Reinstate cleanup, remove debug printlns. --- controllers/reaper/reaper_controller.go | 1 - pkg/reaper/deployment.go | 2 -- test/e2e/suite_test.go | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/controllers/reaper/reaper_controller.go b/controllers/reaper/reaper_controller.go index d1784f773..f419355fe 100644 --- a/controllers/reaper/reaper_controller.go +++ b/controllers/reaper/reaper_controller.go @@ -159,7 +159,6 @@ func (r *ReaperReconciler) reconcileDeployment( deploymentKey := types.NamespacedName{Namespace: actualReaper.Namespace, Name: actualReaper.Name} logger = logger.WithValues("Deployment", deploymentKey) logger.Info(fmt.Sprintf("Reconciling reaper deployment, req was %#v", actualReaper)) - println("reaper http management proxy was: ", actualReaper.Spec.HttpManagement.Enabled) authVars, err := r.collectAuthVars(ctx, actualReaper, logger) if err != nil { diff --git a/pkg/reaper/deployment.go b/pkg/reaper/deployment.go index cc5fe4e73..266813bb2 100644 --- a/pkg/reaper/deployment.go +++ b/pkg/reaper/deployment.go @@ -152,9 +152,7 @@ func NewDeployment(reaper *api.Reaper, dc *cassdcapi.CassandraDatacenter, keysto Value: fmt.Sprintf("%d", reaper.Spec.HeapSize.Value()), }) } - println("Reconciling new Reaper deployment: ", reaper) if reaper.Spec.HttpManagement.Enabled { - println("Reconciling new Reaper deployment,HttpManagement.Enabled ") envVars = append(envVars, corev1.EnvVar{ Name: "REAPER_HTTP_MANAGEMENT_ENABLE", Value: "true", diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go index 708caae14..86d3a5904 100644 --- a/test/e2e/suite_test.go +++ b/test/e2e/suite_test.go @@ -249,8 +249,8 @@ func TestOperator(t *testing.T) { t.Run("CreateSingleReaper", e2eTest(ctx, &e2eTestOpts{ testFunc: createSingleReaper, fixture: framework.NewTestFixture("single-dc-reaper", controlPlane), - skipK8ssandraClusterCleanup: true, // TODO: reinstate cleanup - doCassandraDatacenterCleanup: false, // TODO: reinstate cleanup + skipK8ssandraClusterCleanup: false, + doCassandraDatacenterCleanup: true, })) t.Run("CreateMultiReaper", e2eTest(ctx, &e2eTestOpts{ testFunc: createMultiReaper,