From 474cec32df584810e4fb4e09d768f0ce4c5f7bab Mon Sep 17 00:00:00 2001 From: Valentin Zayash Date: Sat, 30 May 2020 17:49:53 +0300 Subject: [PATCH] [stable/rabbitmq-ha] Separate annotations for discovery service (#18270) (#22576) Signed-off-by: Valentin Zayash --- stable/rabbitmq-ha/Chart.yaml | 2 +- stable/rabbitmq-ha/README.md | 2 ++ stable/rabbitmq-ha/templates/service-discovery.yaml | 5 ++++- stable/rabbitmq-ha/values.yaml | 7 +++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/stable/rabbitmq-ha/Chart.yaml b/stable/rabbitmq-ha/Chart.yaml index 3a322ec70d..2d2a686c8f 100644 --- a/stable/rabbitmq-ha/Chart.yaml +++ b/stable/rabbitmq-ha/Chart.yaml @@ -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: diff --git a/stable/rabbitmq-ha/README.md b/stable/rabbitmq-ha/README.md index 4bb862955b..c2f52e57ff 100644 --- a/stable/rabbitmq-ha/README.md +++ b/stable/rabbitmq-ha/README.md @@ -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 | | diff --git a/stable/rabbitmq-ha/templates/service-discovery.yaml b/stable/rabbitmq-ha/templates/service-discovery.yaml index 41a8dafbae..283d345d2c 100644 --- a/stable/rabbitmq-ha/templates/service-discovery.yaml +++ b/stable/rabbitmq-ha/templates/service-discovery.yaml @@ -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 }} diff --git a/stable/rabbitmq-ha/values.yaml b/stable/rabbitmq-ha/values.yaml index aaa1cf77e8..ede7dcc956 100644 --- a/stable/rabbitmq-ha/values.yaml +++ b/stable/rabbitmq-ha/values.yaml @@ -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