Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enforce and default Kafka configuration #896

Merged
merged 2 commits into from
Jan 3, 2024
Merged

Enforce and default Kafka configuration #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a5faca
wait for kafka to be ready
nasark Oct 5, 2022
4d4fdbf
default deployMessagingService to true
nasark Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions images/manageiq-orchestrator/container-assets/entrypoint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
bdunne marked this conversation as resolved.
Show resolved Hide resolved
} else {
return *cr.Spec.DeployMessagingService
}
Expand Down
2 changes: 1 addition & 1 deletion manageiq-operator/api/v1alpha1/manageiq_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
bdunne marked this conversation as resolved.
Show resolved Hide resolved
DeployMessagingService *bool `json:"deployMessagingService,omitempty"`

Expand Down
4 changes: 2 additions & 2 deletions manageiq-operator/config/crd/bases/manageiq.org_manageiqs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading