Merge pull request #18 from dexidp/fix-annotations

fix(charts/dex): fix template rendering when podAnnotations is set

charts/dex/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 type: application
 name: dex
-version: 0.0.3
+version: 0.0.4
 appVersion: "2.28.0"
 kubeVersion: ">=1.14.0-0"
 description: OpenID Connect (OIDC) identity and OAuth 2.0 provider with pluggable connectors
@@ -21,7 +21,7 @@ maintainers:
     url: https://sagikazarmark.hu
 annotations:
   artifacthub.io/changes: |
-    - Fix envFrom (add missing envFrom to the deployment)
+    - Fix template rendering when podAnnotations is set
   artifacthub.io/images: |
     - name: dex
       image: ghcr.io/dexidp/dex:v2.28.0

charts/dex/README.md

@@ -1,6 +1,6 @@
 # dex
 
-![version: 0.0.1](https://img.shields.io/badge/version-0.0.1-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 2.28.0](https://img.shields.io/badge/app%20version-2.28.0-informational?style=flat-square) ![kube version: >=1.16.0-0](https://img.shields.io/badge/kube%20version->=1.16.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-dex-informational?style=flat-square)](https://artifacthub.io/packages/helm/dex/dex)
+![version: 0.0.4](https://img.shields.io/badge/version-0.0.4-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 2.28.0](https://img.shields.io/badge/app%20version-2.28.0-informational?style=flat-square) ![kube version: >=1.14.0-0](https://img.shields.io/badge/kube%20version->=1.14.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-dex-informational?style=flat-square)](https://artifacthub.io/packages/helm/dex/dex)
 
 OpenID Connect (OIDC) identity and OAuth 2.0 provider with pluggable connectors
 

charts/dex/ci/pod-annotations-values.yaml

@@ -0,0 +1,10 @@
+config:
+  issuer: https://my-issuer.com
+
+  storage:
+    type: memory
+
+  enablePasswordDB: true
+
+podAnnotations:
+  vault.security.banzaicloud.io/vault-addr: "https://vault.vault:8200"

charts/dex/templates/deployment.yaml

@@ -13,11 +13,11 @@ spec:
       {{- include "dex.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
       annotations:
+      {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
-        checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
       {{- end }}
+        checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
       labels:
         {{- include "dex.selectorLabels" . | nindent 8 }}
     spec: