From 9645b22e0afb9e3adbfa17bd7c845a0aa254e769 Mon Sep 17 00:00:00 2001 From: Daniel Koopmans Date: Fri, 18 Oct 2019 17:36:00 +0200 Subject: [PATCH] [stable/consul] Add podAnnotations (#17487) * Add: podAnnotations Signed-off-by: Daniel Koopmans * Bump stable/consul version 3.8.2 Signed-off-by: Daniel Koopmans --- stable/consul/Chart.yaml | 2 +- stable/consul/README.md | 1 + stable/consul/templates/consul-statefulset.yaml | 4 ++++ stable/consul/values.yaml | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/stable/consul/Chart.yaml b/stable/consul/Chart.yaml index 93eced2eef..7747b2895f 100755 --- a/stable/consul/Chart.yaml +++ b/stable/consul/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: consul home: https://github.com/hashicorp/consul -version: 3.9.0 +version: 3.9.1 appVersion: 1.5.3 description: Highly available and distributed service discovery and key-value store designed with support for the modern data center to make distributed systems and diff --git a/stable/consul/README.md b/stable/consul/README.md index a1abb61caa..832aaec94d 100644 --- a/stable/consul/README.md +++ b/stable/consul/README.md @@ -55,6 +55,7 @@ The following table lists the configurable parameters of the consul chart and th | `affinity` | Consul affinity settings | `see values.yaml` | | `nodeSelector` | Node labels for pod assignment | `{}` | | `tolerations` | Tolerations for pod assignment | `[]` | +| `podAnnotations` | Annotations for pod | `{}` | | `maxUnavailable` | Pod disruption Budget maxUnavailable | `1` | | `ui.enabled` | Enable Consul Web UI | `true` | | `uiIngress.enabled` | Create Ingress for Consul Web UI | `false` | diff --git a/stable/consul/templates/consul-statefulset.yaml b/stable/consul/templates/consul-statefulset.yaml index 51f76c7bb7..377f026d79 100644 --- a/stable/consul/templates/consul-statefulset.yaml +++ b/stable/consul/templates/consul-statefulset.yaml @@ -22,6 +22,10 @@ spec: template: metadata: name: "{{ template "consul.fullname" . }}" +{{- if .Values.podAnnotations }} + annotations: +{{ toYaml .Values.podAnnotations | indent 8 }} +{{- end }} labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} diff --git a/stable/consul/values.yaml b/stable/consul/values.yaml index 5d50ed2adf..0b55e8f222 100644 --- a/stable/consul/values.yaml +++ b/stable/consul/values.yaml @@ -148,6 +148,7 @@ test: nodeSelector: {} tolerations: [] additionalLabels: {} +podAnnotations: {} # Lifecycle for StatefulSet # lifecycle: