[bitnami/rabbitmq-cluster-operator] Support toggle to disable rabbitmq messaging topology operator installation (#17539)

* Support toggle for RabbitMQ Messaging Topology Operator installation

Signed-off-by: Zhou, Martin <Martin_Zhou2@Dell.com>

* Generate README for new configuration parameter

Signed-off-by: Zhou, Martin <Martin_Zhou2@Dell.com>

* Update version bump

Signed-off-by: Zhou, Martin <Martin_Zhou2@Dell.com>

* Update version bump

Signed-off-by: Zhou, Martin <Martin_Zhou2@Dell.com>

* fix VIB issue

Signed-off-by: Zhou, Martin <Martin_Zhou2@Dell.com>

* rollback version bump to 3.4.3

Signed-off-by: Zhou, Martin <Martin_Zhou2@Dell.com>

* update version bump for CI/CD issue

Signed-off-by: Zhou, Martin <Martin_Zhou2@Dell.com>

* Also add toggle for goss validation, should not verify status of rmq-op-webhook if messaging topology operator installation disabled

Signed-off-by: Zhou, Martin <Martin_Zhou2@Dell.com>

* refinement as comments

Signed-off-by: Zhou, Martin <Martin_Zhou2@Dell.com>

* Updated

Signed-off-by: Zhou, Martin <Martin_Zhou2@Dell.com>

---------

Signed-off-by: Zhou, Martin <Martin_Zhou2@Dell.com>
Signed-off-by: Martin.Zhou <xixiangzouyibian@users.noreply.github.com>
Co-authored-by: Zhou, Martin <Martin_Zhou2@Dell.com>
This commit is contained in:
Martin.Zhou
2023-07-15 00:09:52 +08:00
committed by GitHub
parent ea241c09dd
commit fc34693b20
16 changed files with 22 additions and 9 deletions

View File

@@ -28,4 +28,4 @@ maintainers:
name: rabbitmq-cluster-operator
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq-cluster-operator
version: 3.5.0
version: 3.6.0

View File

@@ -267,6 +267,7 @@ This solution allows to easily deploy multiple RabbitMQ instances compared to th
| Name | Description | Value |
| --------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------- |
| `msgTopologyOperator.enabled` | Deploy RabbitMQ Messaging Topology Operator as part of the installation | `true` |
| `msgTopologyOperator.image.registry` | RabbitMQ Messaging Topology Operator image registry | `docker.io` |
| `msgTopologyOperator.image.repository` | RabbitMQ Messaging Topology Operator image repository | `bitnami/rmq-messaging-topology-operator` |
| `msgTopologyOperator.image.tag` | RabbitMQ Messaging Topology Operator image tag (immutable tags are recommended) | `1.12.0-scratch-r0` |

View File

@@ -3,7 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if and (.Values.useCertManager) (not .Values.msgTopologyOperator.existingWebhookCertSecret) }}
{{- if and (.Values.msgTopologyOperator.enabled) (.Values.useCertManager) (not .Values.msgTopologyOperator.existingWebhookCertSecret) }}
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:

View File

@@ -3,7 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if .Values.msgTopologyOperator.rbac.create }}
{{- if and .Values.msgTopologyOperator.enabled .Values.msgTopologyOperator.rbac.create }}
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
kind: ClusterRole
metadata:

View File

@@ -3,7 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if .Values.msgTopologyOperator.rbac.create }}
{{- if and .Values.msgTopologyOperator.enabled .Values.msgTopologyOperator.rbac.create }}
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
kind: ClusterRoleBinding
metadata:

View File

@@ -3,6 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if .Values.msgTopologyOperator.enabled }}
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
@@ -174,3 +175,4 @@ spec:
{{- if .Values.msgTopologyOperator.extraVolumes }}
{{- include "common.tplvalues.render" (dict "value" .Values.msgTopologyOperator.extraVolumes "context" $) | nindent 8 }}
{{- end }}
{{- end }}

View File

@@ -3,7 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if .Values.msgTopologyOperator.metrics.enabled }}
{{- if and .Values.msgTopologyOperator.enabled .Values.msgTopologyOperator.metrics.enabled }}
apiVersion: v1
kind: Service
metadata:

View File

@@ -3,7 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if .Values.msgTopologyOperator.rbac.create }}
{{- if and .Values.msgTopologyOperator.enabled .Values.msgTopologyOperator.rbac.create }}
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
kind: Role
metadata:

View File

@@ -3,7 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if .Values.msgTopologyOperator.rbac.create }}
{{- if and .Values.msgTopologyOperator.enabled .Values.msgTopologyOperator.rbac.create }}
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
kind: RoleBinding
metadata:

View File

@@ -3,7 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if .Values.msgTopologyOperator.serviceAccount.create }}
{{- if and .Values.msgTopologyOperator.enabled .Values.msgTopologyOperator.serviceAccount.create }}
apiVersion: v1
kind: ServiceAccount
metadata:

View File

@@ -3,7 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if and .Values.msgTopologyOperator.metrics.serviceMonitor.enabled .Values.msgTopologyOperator.metrics.enabled }}
{{- if and .Values.msgTopologyOperator.enabled .Values.msgTopologyOperator.metrics.serviceMonitor.enabled .Values.msgTopologyOperator.metrics.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:

View File

@@ -3,6 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if .Values.msgTopologyOperator.enabled }}
{{/*
If the user does not have cert-manager and is not providing a secret with the certificates, the chart needs to generate the secret
*/}}
@@ -311,3 +312,4 @@ webhooks:
resources:
- vhosts
sideEffects: None
{{- end }}

View File

@@ -3,6 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if .Values.msgTopologyOperator.enabled }}
apiVersion: v1
kind: Service
metadata:
@@ -58,3 +59,4 @@ spec:
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: messaging-topology-operator
{{- end }}

View File

@@ -479,6 +479,9 @@ clusterOperator:
## @section RabbitMQ Messaging Topology Operator Parameters
##
msgTopologyOperator:
## @param msgTopologyOperator.enabled Deploy RabbitMQ Messaging Topology Operator as part of the installation
##
enabled: true
## Bitnami RabbitMQ Messaging Topology Operator image
## ref: https://hub.docker.com/r/bitnami/rmq-messaging-topology-operator/tags/
## @param msgTopologyOperator.image.registry RabbitMQ Messaging Topology Operator image registry