From 625969a6f92c4e52df49da02d466b1ecbf440652 Mon Sep 17 00:00:00 2001 From: Tommy Kindmark Date: Fri, 14 Sep 2018 12:41:38 +0200 Subject: [PATCH] Added ability to add extra podAnnotations (#7570) Signed-off-by: towmeykaw --- stable/rabbitmq-ha/Chart.yaml | 2 +- stable/rabbitmq-ha/README.md | 1 + stable/rabbitmq-ha/templates/statefulset.yaml | 3 +++ stable/rabbitmq-ha/values.yaml | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/stable/rabbitmq-ha/Chart.yaml b/stable/rabbitmq-ha/Chart.yaml index 9d4c5d8e77..0f78bc0f68 100644 --- a/stable/rabbitmq-ha/Chart.yaml +++ b/stable/rabbitmq-ha/Chart.yaml @@ -1,7 +1,7 @@ name: rabbitmq-ha apiVersion: v1 appVersion: 3.7.4 -version: 1.9.1 +version: 1.10.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 8bc0853667..e043cde316 100644 --- a/stable/rabbitmq-ha/README.md +++ b/stable/rabbitmq-ha/README.md @@ -133,6 +133,7 @@ and their default values. | `service.loadBalancerSourceRanges` | List of IP CIDRs allowed access to load balancer (if supported) | `[]` | | `service.type` | Type of service to create | `ClusterIP` | | `tolerations` | Toleration labels for pod assignment | `[]` | +| `podAnnotations` | Extra annotations to add to pod | `{}` | | `terminationGracePeriodSeconds` | Duration pod needs to terminate gracefully | `10` | | `updateStrategy` | Statefulset update strategy | `OnDelete` | | `extraLabels` | Labels to add to the Resources | `{}` | diff --git a/stable/rabbitmq-ha/templates/statefulset.yaml b/stable/rabbitmq-ha/templates/statefulset.yaml index c65fac6a4d..e0f340b4df 100644 --- a/stable/rabbitmq-ha/templates/statefulset.yaml +++ b/stable/rabbitmq-ha/templates/statefulset.yaml @@ -30,6 +30,9 @@ spec: {{- if and .Values.prometheus.exporter.enabled (not .Values.prometheus.operator.enabled) }} prometheus.io/scrape: "true" prometheus.io/port: {{ .Values.prometheus.exporter.port | quote }} +{{- end }} +{{- if .Values.podAnnotations }} +{{ toYaml .Values.podAnnotations | indent 8 }} {{- end }} spec: {{- if .Values.image.pullSecrets }} diff --git a/stable/rabbitmq-ha/values.yaml b/stable/rabbitmq-ha/values.yaml index 615b5d22e8..0caa3b5a47 100644 --- a/stable/rabbitmq-ha/values.yaml +++ b/stable/rabbitmq-ha/values.yaml @@ -259,6 +259,9 @@ nodeSelector: {} ## tolerations: [] +## Extra Annotations to be added to pod +podAnnotations: {} + ## Pod affinity ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity podAntiAffinity: soft