[stable/rabbitmq-ha] Separate annotations for discovery service (#18270) (#22576)

Signed-off-by: Valentin Zayash <valioozz@gmail.com>
This commit is contained in:
Valentin Zayash
2020-05-30 07:49:53 -07:00
committed by GitHub
parent 32b18120b8
commit 474cec32df
4 changed files with 14 additions and 2 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
name: rabbitmq-ha
apiVersion: v1
appVersion: 3.8.0
version: 1.45.0
version: 1.46.0
description: Highly available RabbitMQ cluster, the open source message broker
software that implements the Advanced Message Queuing Protocol (AMQP).
keywords:
+2
View File
@@ -177,6 +177,8 @@ and their default values.
| `service.externalTrafficPolicy` | Sets the external traffic policy for the service | `""` |
| `service.loadBalancerSourceRanges` | List of IP CIDRs allowed access to load balancer (if supported) | `[]` |
| `service.type` | Type of service to create | `ClusterIP` |
| `service.discovery.separateAnnotations` | Control if discovery service should have it's own annotations instead of `service.annotations` | `false` |
| `service.discovery.annotations` | Annotations to add to the discovery service | `{}` |
| `ingress.enabled` | Enable Ingress | `false` |
| `ingress.path` | Ingress path | `/` |
| `ingress.hostName` | Ingress hostname | |
@@ -1,7 +1,10 @@
apiVersion: v1
kind: Service
metadata:
{{- if .Values.service.annotations }}
{{- if .Values.service.discovery.annotations }}
annotations:
{{ tpl (toYaml .Values.discovery.annotations) . | indent 4 }}
{{- else if and (.Values.service.annotations) (not .Values.service.discovery.separateAnnotations) }}
annotations:
{{ tpl (toYaml .Values.service.annotations) . | indent 4 }}
{{- end }}
+7
View File
@@ -342,6 +342,13 @@ service:
amqpNodePort: null
managerNodePort: null
## Custom annotations for discovery service
## Will fallback to `service.annotations` while `separateAnnotations: false`
##
discovery:
separateAnnotations: false
annotations: {}
podManagementPolicy: OrderedReady
## Statefulsets rolling update update strategy