From a64849ffc8703f5e5f201260c1078fd8439ce179 Mon Sep 17 00:00:00 2001 From: Rick Haan Date: Fri, 21 Jun 2019 19:29:19 +0200 Subject: [PATCH 1/2] [stable/dex] Add pod annotations Added the ability to configure your own pod annotations to the deployment of dex. An example: ``` yaml podAnnotations: prometheus.io/path: "/metrics" prometheus.io/port: "5558" prometheus.io/scrape: "true" ``` Signed-off-by: Rick Haan --- stable/dex/templates/deployment.yaml | 3 +++ stable/dex/values.yaml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/stable/dex/templates/deployment.yaml b/stable/dex/templates/deployment.yaml index 3069b4e22752..bf779487651a 100644 --- a/stable/dex/templates/deployment.yaml +++ b/stable/dex/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: release: "{{ .Release.Name }}" annotations: checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} + {{- if .Values.podAnnotations }} +{{ toYaml .Values.podAnnotations | indent 8 }} + {{- end }} spec: serviceAccountName: {{ template "dex.serviceAccountName" . }} nodeSelector: diff --git a/stable/dex/values.yaml b/stable/dex/values.yaml index 80e1f568854d..f0226296ee66 100644 --- a/stable/dex/values.yaml +++ b/stable/dex/values.yaml @@ -11,6 +11,8 @@ inMiniKube: false nodeSelector: {} +podAnnotations: {} + tolerations: [] # - key: CriticalAddonsOnly # operator: Exists From 6bb65682eb5c298fef4fd9df25fa08e3393c9fec Mon Sep 17 00:00:00 2001 From: Rick Haan Date: Fri, 21 Jun 2019 20:02:01 +0200 Subject: [PATCH 2/2] [stable/dex] Bump minor chart version My pull request adds functionality in a backwards-compatible manner. This means a bump in the minor version of the chart. Signed-off-by: Rick Haan --- stable/dex/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/dex/Chart.yaml b/stable/dex/Chart.yaml index 5376b123e97b..9dfadfafd06c 100644 --- a/stable/dex/Chart.yaml +++ b/stable/dex/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: dex -version: 1.4.0 +version: 1.5.0 appVersion: 2.16.0 description: CoreOS Dex keywords: