Merge pull request #896 from nasark/require_kafka

Enforce and default Kafka configuration (cherry picked from commit 09da4c7)
ManageIQ · Jan 5, 2024 · fe79478 · fe79478
1 parent 13467a0
commit fe79478
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/images/manageiq-orchestrator/container-assets/entrypoint b/images/manageiq-orchestrator/container-assets/entrypoint
@@ -117,6 +117,10 @@ EOS
 check_svc_status ${MEMCACHED_SERVICE_HOST} ${MEMCACHED_SERVICE_PORT}
 check_svc_status ${database_hostname} ${database_port}
 
+if [ -n "$MESSAGING_HOSTNAME" ] && [ -n "$MESSAGING_PORT" ]; then
+  check_svc_status ${MESSAGING_HOSTNAME} ${MESSAGING_PORT}
+fi
+
 check_deployment_status || exit 1
 
 pushd ${APP_ROOT}

diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go
@@ -51,7 +51,7 @@ func databaseVolumeCapacity(cr *miqv1alpha1.ManageIQ) string {
 
 func deployMessagingService(cr *miqv1alpha1.ManageIQ) bool {
 	if cr.Spec.DeployMessagingService == nil {
-		return false
+		return true
 	} else {
 		return *cr.Spec.DeployMessagingService
 	}

diff --git a/manageiq-operator/api/v1alpha1/manageiq_types.go b/manageiq-operator/api/v1alpha1/manageiq_types.go
@@ -64,7 +64,7 @@ type ManageIQSpec struct {
 	// +optional
 	DatabaseVolumeCapacity string `json:"databaseVolumeCapacity,omitempty"`
 
-	// Flag to indicate if Kafka and Zookeeper should be deployed (default: false)
+	// Deprecated: Flag to indicate if Kafka and Zookeeper should be deployed (default: true)
 	// +optional
 	DeployMessagingService *bool `json:"deployMessagingService,omitempty"`
 

diff --git 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: true)'
                 type: boolean
               enableApplicationLocalLogin:
                 description: 'Flag to allow logging into the application without SSO