From 7f9db6c310c675338adb63a9ba33a427f96b3f58 Mon Sep 17 00:00:00 2001
From: nasark <nasarak_786@hotmail.com>
Date: Wed, 5 Oct 2022 17:06:14 -0400
Subject: [PATCH] deprecate deployMessagingService flag

---
 .../api/v1alpha1/helpers/miq-components/cr.go          | 10 ----------
 .../v1alpha1/helpers/miq-components/orchestrator.go    |  4 ----
 manageiq-operator/api/v1alpha1/manageiq_types.go       |  3 +--
 .../config/crd/bases/manageiq.org_manageiqs.yaml       |  4 ++--
 manageiq-operator/controllers/manageiq_controller.go   |  8 +++-----
 5 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go
index 829d30846..0e5cfd4cc 100644
--- a/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go
+++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go
@@ -49,14 +49,6 @@ func databaseVolumeCapacity(cr *miqv1alpha1.ManageIQ) string {
 	}
 }
 
-func deployMessagingService(cr *miqv1alpha1.ManageIQ) bool {
-	if cr.Spec.DeployMessagingService == nil {
-		return false
-	} else {
-		return *cr.Spec.DeployMessagingService
-	}
-}
-
 func enableApplicationLocalLogin(cr *miqv1alpha1.ManageIQ) bool {
 	if cr.Spec.EnableApplicationLocalLogin == nil {
 		return true
@@ -347,7 +339,6 @@ func zookeeperVolumeCapacity(cr *miqv1alpha1.ManageIQ) string {
 
 func ManageCR(cr *miqv1alpha1.ManageIQ, c *client.Client) (*miqv1alpha1.ManageIQ, controllerutil.MutateFn) {
 	f := func() error {
-		varDeployMessagingService := deployMessagingService(cr)
 		varEnableApplicationLocalLogin := enableApplicationLocalLogin(cr)
 		varEnableSSO := enableSSO(cr)
 		varEnforceWorkerResourceConstraints := enforceWorkerResourceConstraints(cr)
@@ -357,7 +348,6 @@ func ManageCR(cr *miqv1alpha1.ManageIQ, c *client.Client) (*miqv1alpha1.ManageIQ
 		cr.Spec.DatabaseRegion = databaseRegion(cr)
 		cr.Spec.DatabaseSecret = databaseSecret(cr)
 		cr.Spec.DatabaseVolumeCapacity = databaseVolumeCapacity(cr)
-		cr.Spec.DeployMessagingService = &varDeployMessagingService
 		cr.Spec.EnableApplicationLocalLogin = &varEnableApplicationLocalLogin
 		cr.Spec.EnableSSO = &varEnableSSO
 		cr.Spec.EnforceWorkerResourceConstraints = &varEnforceWorkerResourceConstraints
diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/orchestrator.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/orchestrator.go
index 099ccb60a..087c4b015 100644
--- a/manageiq-operator/api/v1alpha1/helpers/miq-components/orchestrator.go
+++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/orchestrator.go
@@ -111,10 +111,6 @@ func orchestratorObjectName(cr *miqv1alpha1.ManageIQ) string {
 }
 
 func addMessagingEnv(cr *miqv1alpha1.ManageIQ, c *corev1.Container) {
-	if !*cr.Spec.DeployMessagingService {
-		return
-	}
-
 	messagingEnv := []corev1.EnvVar{
 		corev1.EnvVar{
 			Name: "MESSAGING_HOSTNAME",
diff --git a/manageiq-operator/api/v1alpha1/manageiq_types.go b/manageiq-operator/api/v1alpha1/manageiq_types.go
index cc9279c8b..de796ff5e 100644
--- a/manageiq-operator/api/v1alpha1/manageiq_types.go
+++ b/manageiq-operator/api/v1alpha1/manageiq_types.go
@@ -63,8 +63,7 @@ type ManageIQSpec struct {
 	// +optional
 	DatabaseVolumeCapacity string `json:"databaseVolumeCapacity,omitempty"`
 
-	// Flag to indicate if Kafka and Zookeeper should be deployed (default: false)
-	// +optional
+	// Deprecated: Flag to indicate if Kafka and Zookeeper should be deployed (default: false)
 	DeployMessagingService *bool `json:"deployMessagingService,omitempty"`
 
 	// Flag to allow logging into the application without SSO (default: true)
diff --git a/manageiq-operator/config/crd/bases/manageiq.org_manageiqs.yaml b/manageiq-operator/config/crd/bases/manageiq.org_manageiqs.yaml
index a659cf13a..6d4e6701a 100644
--- a/manageiq-operator/config/crd/bases/manageiq.org_manageiqs.yaml
+++ b/manageiq-operator/config/crd/bases/manageiq.org_manageiqs.yaml
@@ -68,8 +68,8 @@ spec:
                 description: 'Database volume size (default: 15Gi)'
                 type: string
               deployMessagingService:
-                description: 'Flag to indicate if Kafka and Zookeeper should be deployed
-                  (default: false)'
+                description: 'Deprecated: Flag to indicate if Kafka and Zookeeper
+                  should be deployed (default: false)'
                 type: boolean
               enableApplicationLocalLogin:
                 description: 'Flag to allow logging into the application without SSO
diff --git a/manageiq-operator/controllers/manageiq_controller.go b/manageiq-operator/controllers/manageiq_controller.go
index c7bb4f87d..216fe2ec7 100644
--- a/manageiq-operator/controllers/manageiq_controller.go
+++ b/manageiq-operator/controllers/manageiq_controller.go
@@ -133,11 +133,9 @@ func (r *ManageIQReconciler) Reconcile(ctx context.Context, request ctrl.Request
 	if e := r.generateMemcachedResources(miqInstance); e != nil {
 		return reconcile.Result{}, e
 	}
-	if *miqInstance.Spec.DeployMessagingService {
-		logger.Info("Reconciling the Kafka resources...")
-		if e := r.generateKafkaResources(miqInstance); e != nil {
-			return reconcile.Result{}, e
-		}
+	logger.Info("Reconciling the Kafka resources...")
+	if e := r.generateKafkaResources(miqInstance); e != nil {
+		return reconcile.Result{}, e
 	}
 	logger.Info("Reconciling the Orchestrator resources...")
 	if e := r.generateOrchestratorResources(miqInstance); e != nil {