Make HttpManagement.Enabled a pointer.

k8ssandra · Oct 19, 2023 · 874360e · 874360e
1 parent dc5f807
commit 874360e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/apis/reaper/v1alpha1/reaper_types.go b/apis/reaper/v1alpha1/reaper_types.go
@@ -378,7 +378,7 @@ type HttpManagement struct {
 	// 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"`
+	Enabled *bool `json:"enabled"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/apis/reaper/v1alpha1/zz_generated.deepcopy.go b/apis/reaper/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/reaper/deployment.go b/pkg/reaper/deployment.go
@@ -152,7 +152,7 @@ func NewDeployment(reaper *api.Reaper, dc *cassdcapi.CassandraDatacenter, keysto
 			Value: fmt.Sprintf("%d", reaper.Spec.HeapSize.Value()),
 		})
 	}
-	if reaper.Spec.HttpManagement.Enabled {
+	if reaper.Spec.HttpManagement.Enabled != nil && *reaper.Spec.HttpManagement.Enabled {
 		envVars = append(envVars, corev1.EnvVar{
 			Name:  "REAPER_HTTP_MANAGEMENT_ENABLE",
 			Value: "true",

diff --git a/pkg/reaper/deployment_test.go b/pkg/reaper/deployment_test.go
@@ -28,7 +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.HttpManagement.Enabled = pointer.Bool(true)
 	reaper.Spec.ClientEncryptionStores = &encryption.Stores{
 		KeystoreSecretRef: &encryption.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{
 			Name: "keystore-secret",