Add settings to configure reaper HTTP management interface (#1082)

* Add settings to configure reaper HTTP management interface. --------- Co-authored-by: Alexander Dejanovski <[email protected]>
k8ssandra · Oct 19, 2023 · dc5f807 · dc5f807
1 parent 16f7b8b
commit dc5f807
Show file tree

Hide file tree

Showing 18 changed files with 234 additions and 40 deletions.
diff --git a/.github/workflows/kind_e2e_tests.yaml b/.github/workflows/kind_e2e_tests.yaml
@@ -130,10 +130,6 @@ jobs:
         with:
           go-version-file: 'go.mod'
           cache: true
-      - name: Install kubectl
-        run: |
-          curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-          sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
       - name: Install kustomize
         uses: imranismail/setup-kustomize@v2
         with:

diff --git a/.github/workflows/kind_multicluster_e2e_tests.yaml b/.github/workflows/kind_multicluster_e2e_tests.yaml
@@ -102,10 +102,6 @@ jobs:
         with:
           go-version-file: 'go.mod'
           cache: true
-      - name: Install kubectl
-        run: |
-          curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-          sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
       - name: Install kustomize
         uses: imranismail/setup-kustomize@v2
         with:

diff --git a/.github/workflows/kind_multicluster_isolated_control_plane_e2e_tests.yaml b/.github/workflows/kind_multicluster_isolated_control_plane_e2e_tests.yaml
@@ -80,10 +80,6 @@ jobs:
         with:
           go-version-file: 'go.mod'
           cache: true
-      - name: Install kubectl
-        run: |
-          curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-          sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
       - name: Install kustomize
         uses: imranismail/setup-kustomize@v2
         with:

diff --git a/apis/reaper/v1alpha1/reaper_types.go b/apis/reaper/v1alpha1/reaper_types.go
@@ -67,15 +67,17 @@ type ReaperTemplate struct {
 	SecretsProvider string `json:"secretsProvider,omitempty"`
 
 	// The image to use for the Reaper pod main container.
-	// The default is "thelastpickle/cassandra-reaper:3.3.4".
+	// The default is "thelastpickle/cassandra-reaper:7162ea3".
 	// +optional
-	// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"3.3.4"}
+	// TODO: update with real release version.
+	// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"7162ea3"}
 	ContainerImage *images.Image `json:"containerImage,omitempty"`
 
 	// The image to use for the Reaper pod init container (that performs schema migrations).
-	// The default is "thelastpickle/cassandra-reaper:3.3.4".
+	// The default is "thelastpickle/cassandra-reaper:7162ea3".
 	// +optional
-	// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"3.3.4"}
+	// TODO: update with real release version.
+	// +kubebuilder:default={repository:"thelastpickle",name:"cassandra-reaper",tag:"7162ea3"}
 	InitContainerImage *images.Image `json:"initContainerImage,omitempty"`
 
 	// +kubebuilder:default="default"
@@ -139,6 +141,10 @@ type ReaperTemplate struct {
 	// labels and annotations for Reaper resources
 	// +optional
 	ResourceMeta *meta.ResourceMeta `json:"metadata,omitempty"`
+
+	// +kubebuilder:default={enabled: false}
+	// +optional
+	HttpManagement HttpManagement `json:"httpManagement"`
 }
 
 // UseExternalSecrets defines whether the user has specified if credentials and
@@ -367,6 +373,14 @@ type Reaper struct {
 	Status ReaperStatus `json:"status,omitempty"`
 }
 
+type HttpManagement struct {
+	// Enable/disable the HTTP management connection between Reaper and Cassandra.
+	// When enabled, HTTP will be used instead of JMX for management connectivity between Cassandra
+	// and Reaper. In future, this will be true by default
+	// +kubebuilder:default=false
+	Enabled bool `json:"enabled"`
+}
+
 // +kubebuilder:object:root=true
 
 // ReaperList contains a list of Reaper

diff --git a/apis/reaper/v1alpha1/zz_generated.deepcopy.go b/apis/reaper/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml b/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml
@@ -28402,9 +28402,10 @@ spec:
                     default:
                       name: cassandra-reaper
                       repository: thelastpickle
-                      tag: 3.3.4
-                    description: The image to use for the Reaper pod main container.
-                      The default is "thelastpickle/cassandra-reaper:3.3.4".
+                      tag: 7162ea3
+                    description: 'The image to use for the Reaper pod main container.
+                      The default is "thelastpickle/cassandra-reaper:7162ea3". TODO:
+                      update with real release version.'
                     properties:
                       name:
                         description: The image name to use.
@@ -28457,13 +28458,28 @@ spec:
                     description: HeapSize sets the JVM heap size to use for Reaper.
                     pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                     x-kubernetes-int-or-string: true
+                  httpManagement:
+                    default:
+                      enabled: false
+                    properties:
+                      enabled:
+                        default: false
+                        description: Enable/disable the HTTP management connection
+                          between Reaper and Cassandra. When enabled, HTTP will be
+                          used instead of JMX for management connectivity between
+                          Cassandra and Reaper. In future, this will be true by default
+                        type: boolean
+                    required:
+                    - enabled
+                    type: object
                   initContainerImage:
                     default:
                       name: cassandra-reaper
                       repository: thelastpickle
-                      tag: 3.3.4
-                    description: The image to use for the Reaper pod init container
-                      (that performs schema migrations). The default is "thelastpickle/cassandra-reaper:3.3.4".
+                      tag: 7162ea3
+                    description: 'The image to use for the Reaper pod init container
+                      (that performs schema migrations). The default is "thelastpickle/cassandra-reaper:7162ea3".
+                      TODO: update with real release version.'
                     properties:
                       name:
                         description: The image name to use.

diff --git a/config/crd/bases/reaper.k8ssandra.io_reapers.yaml b/config/crd/bases/reaper.k8ssandra.io_reapers.yaml
@@ -1046,9 +1046,10 @@ spec:
                 default:
                   name: cassandra-reaper
                   repository: thelastpickle
-                  tag: 3.3.4
-                description: The image to use for the Reaper pod main container. The
-                  default is "thelastpickle/cassandra-reaper:3.3.4".
+                  tag: 7162ea3
+                description: 'The image to use for the Reaper pod main container.
+                  The default is "thelastpickle/cassandra-reaper:7162ea3". TODO: update
+                  with real release version.'
                 properties:
                   name:
                     description: The image name to use.
@@ -1127,13 +1128,28 @@ spec:
                 description: HeapSize sets the JVM heap size to use for Reaper.
                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                 x-kubernetes-int-or-string: true
+              httpManagement:
+                default:
+                  enabled: false
+                properties:
+                  enabled:
+                    default: false
+                    description: Enable/disable the HTTP management connection between
+                      Reaper and Cassandra. When enabled, HTTP will be used instead
+                      of JMX for management connectivity between Cassandra and Reaper.
+                      In future, this will be true by default
+                    type: boolean
+                required:
+                - enabled
+                type: object
               initContainerImage:
                 default:
                   name: cassandra-reaper
                   repository: thelastpickle
-                  tag: 3.3.4
-                description: The image to use for the Reaper pod init container (that
-                  performs schema migrations). The default is "thelastpickle/cassandra-reaper:3.3.4".
+                  tag: 7162ea3
+                description: 'The image to use for the Reaper pod init container (that
+                  performs schema migrations). The default is "thelastpickle/cassandra-reaper:7162ea3".
+                  TODO: update with real release version.'
                 properties:
                   name:
                     description: The image name to use.

diff --git a/controllers/reaper/reaper_controller.go b/controllers/reaper/reaper_controller.go
@@ -18,6 +18,7 @@ package reaper
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/go-logr/logr"
 	cassdcapi "github.com/k8ssandra/cass-operator/apis/cassandra/v1beta1"
@@ -157,7 +158,7 @@ func (r *ReaperReconciler) reconcileDeployment(
 
 	deploymentKey := types.NamespacedName{Namespace: actualReaper.Namespace, Name: actualReaper.Name}
 	logger = logger.WithValues("Deployment", deploymentKey)
-	logger.Info("Reconciling Reaper Deployment")
+	logger.Info(fmt.Sprintf("Reconciling reaper deployment, req was %#v", actualReaper))
 
 	authVars, err := r.collectAuthVars(ctx, actualReaper, logger)
 	if err != nil {
@@ -190,6 +191,7 @@ func (r *ReaperReconciler) reconcileDeployment(
 		return vectorReconcileResult, nil
 	}
 
+	logger.Info("Reconciling reaper deployment", "actualReaper", actualReaper)
 	desiredDeployment := reaper.NewDeployment(actualReaper, actualDc, keystorePassword, truststorePassword, logger, authVars...)
 
 	actualDeployment := &appsv1.Deployment{}

diff --git a/pkg/reaper/deployment.go b/pkg/reaper/deployment.go
@@ -24,7 +24,7 @@ import (
 const (
 	DefaultImageRepository = "thelastpickle"
 	DefaultImageName       = "cassandra-reaper"
-	DefaultVersion         = "3.3.4"
+	DefaultVersion         = "7162ea3"
 	// When changing the default version above, please also change the kubebuilder markers in
 	// apis/reaper/v1alpha1/reaper_types.go accordingly.
 
@@ -152,6 +152,12 @@ func NewDeployment(reaper *api.Reaper, dc *cassdcapi.CassandraDatacenter, keysto
 			Value: fmt.Sprintf("%d", reaper.Spec.HeapSize.Value()),
 		})
 	}
+	if reaper.Spec.HttpManagement.Enabled {
+		envVars = append(envVars, corev1.EnvVar{
+			Name:  "REAPER_HTTP_MANAGEMENT_ENABLE",
+			Value: "true",
+		})
+	}
 
 	volumeMounts := []corev1.VolumeMount{}
 	volumes := []corev1.Volume{}

diff --git a/pkg/reaper/deployment_test.go b/pkg/reaper/deployment_test.go
@@ -28,6 +28,7 @@ func TestNewDeployment(t *testing.T) {
 	reaper.Spec.AutoScheduling = reaperapi.AutoScheduling{Enabled: false}
 	reaper.Spec.ServiceAccountName = "reaper"
 	reaper.Spec.DatacenterAvailability = DatacenterAvailabilityAll
+	reaper.Spec.HttpManagement.Enabled = true
 	reaper.Spec.ClientEncryptionStores = &encryption.Stores{
 		KeystoreSecretRef: &encryption.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{
 			Name: "keystore-secret",
@@ -116,6 +117,10 @@ func TestNewDeployment(t *testing.T) {
 			Name:  "REAPER_CASS_NATIVE_PROTOCOL_SSL_ENCRYPTION_ENABLED",
 			Value: "true",
 		},
+		{
+			Name:  "REAPER_HTTP_MANAGEMENT_ENABLE",
+			Value: "true",
+		},
 	})
 
 	assert.Len(t, podSpec.InitContainers, 1)
@@ -156,6 +161,10 @@ func TestNewDeployment(t *testing.T) {
 			Name:  "REAPER_CASS_NATIVE_PROTOCOL_SSL_ENCRYPTION_ENABLED",
 			Value: "true",
 		},
+		{
+			Name:  "REAPER_HTTP_MANAGEMENT_ENABLE",
+			Value: "true",
+		},
 	})
 
 	assert.ElementsMatch(t, initContainer.Args, []string{"schema-migration"})
@@ -177,7 +186,7 @@ func TestNewDeployment(t *testing.T) {
 	deployment = NewDeployment(reaper, newTestDatacenter(), nil, nil, logger)
 	podSpec = deployment.Spec.Template.Spec
 	container = podSpec.Containers[0]
-	assert.Len(t, container.Env, 6)
+	assert.Len(t, container.Env, 7)
 
 	assert.Contains(t, container.Env, corev1.EnvVar{
 		Name:  "REAPER_CASS_KEYSPACE",
@@ -188,7 +197,7 @@ func TestNewDeployment(t *testing.T) {
 	deployment = NewDeployment(reaper, newTestDatacenter(), nil, nil, logger)
 	podSpec = deployment.Spec.Template.Spec
 	container = podSpec.Containers[0]
-	assert.Len(t, container.Env, 16)
+	assert.Len(t, container.Env, 17)
 
 	assert.Contains(t, container.Env, corev1.EnvVar{
 		Name:  "REAPER_AUTO_SCHEDULING_ADAPTIVE",
@@ -302,8 +311,8 @@ func TestImages(t *testing.T) {
 		reaper.Spec.ContainerImage = nil
 		logger := testlogr.NewTestLogger(t)
 		deployment := NewDeployment(reaper, newTestDatacenter(), nil, nil, logger)
-		assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.3.4", deployment.Spec.Template.Spec.InitContainers[0].Image)
-		assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.3.4", deployment.Spec.Template.Spec.Containers[0].Image)
+		assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:7162ea3", deployment.Spec.Template.Spec.InitContainers[0].Image)
+		assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:7162ea3", deployment.Spec.Template.Spec.Containers[0].Image)
 		assert.Equal(t, corev1.PullIfNotPresent, deployment.Spec.Template.Spec.InitContainers[0].ImagePullPolicy)
 		assert.Equal(t, corev1.PullIfNotPresent, deployment.Spec.Template.Spec.Containers[0].ImagePullPolicy)
 		assert.Empty(t, deployment.Spec.Template.Spec.ImagePullSecrets)
@@ -318,8 +327,8 @@ func TestImages(t *testing.T) {
 		reaper.Spec.ContainerImage = nil
 		logger := testlogr.NewTestLogger(t)
 		deployment := NewDeployment(reaper, newTestDatacenter(), nil, nil, logger)
-		assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.3.4", deployment.Spec.Template.Spec.InitContainers[0].Image)
-		assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:3.3.4", deployment.Spec.Template.Spec.Containers[0].Image)
+		assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:7162ea3", deployment.Spec.Template.Spec.InitContainers[0].Image)
+		assert.Equal(t, "docker.io/thelastpickle/cassandra-reaper:7162ea3", deployment.Spec.Template.Spec.Containers[0].Image)
 		assert.Equal(t, corev1.PullIfNotPresent, deployment.Spec.Template.Spec.InitContainers[0].ImagePullPolicy)
 		assert.Equal(t, corev1.PullIfNotPresent, deployment.Spec.Template.Spec.Containers[0].ImagePullPolicy)
 		assert.Empty(t, deployment.Spec.Template.Spec.ImagePullSecrets)

diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
@@ -247,8 +247,10 @@ func TestOperator(t *testing.T) {
 		fixture:  framework.NewTestFixture("multi-dc-stargate", controlPlane),
 	}))
 	t.Run("CreateSingleReaper", e2eTest(ctx, &e2eTestOpts{
-		testFunc: createSingleReaper,
-		fixture:  framework.NewTestFixture("single-dc-reaper", controlPlane),
+		testFunc:                     createSingleReaper,
+		fixture:                      framework.NewTestFixture("single-dc-reaper", controlPlane),
+		skipK8ssandraClusterCleanup:  false,
+		doCassandraDatacenterCleanup: true,
 	}))
 	t.Run("CreateMultiReaper", e2eTest(ctx, &e2eTestOpts{
 		testFunc: createMultiReaper,
@@ -260,6 +262,12 @@ func TestOperator(t *testing.T) {
 		skipK8ssandraClusterCleanup:  true,
 		doCassandraDatacenterCleanup: true,
 	}))
+	t.Run("CreateReaperHttpManagement", e2eTest(ctx, &e2eTestOpts{
+		testFunc:                     createReaperAndDatacenter, // same as above, ensure we can trigger repair. Only difference is that we use a fixture which enabled the HTTP management interface.
+		fixture:                      framework.NewTestFixture("reaper-http-management", dataPlanes[0]),
+		skipK8ssandraClusterCleanup:  true,
+		doCassandraDatacenterCleanup: true,
+	}))
 	t.Run("ClusterScoped", func(t *testing.T) {
 		t.Run("MultiDcMultiCluster", e2eTest(ctx, &e2eTestOpts{
 			testFunc:             multiDcMultiCluster,

diff --git a/test/kuttl/test-servicemonitors/02-prometheus.yaml b/test/kuttl/test-servicemonitors/02-prometheus.yaml
@@ -2,7 +2,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands: 
 - script: |
-    kustomize build ./config/prometheus | kubectl apply --server-side -f -
+    kustomize build ./config/prometheus | kubectl apply --server-side --force-conflicts -f -
   ignoreFailure: true
 - script: |
     until kubectl get crd servicemonitors.monitoring.coreos.com; do sleep 5; done
@@ -11,5 +11,5 @@ commands:
     until kubectl get crd prometheuses.monitoring.coreos.com; do sleep 5; done
   ignoreFailure: true
 - script: | 
-    kustomize build ./config/prometheus | kubectl apply --server-side -f -
+    kustomize build ./config/prometheus | kubectl apply --server-side --force-conflicts -f -
   ignoreFailure: false