Merge pull request #52 from TeddyAndrieux/ability-to-override-checksum

Add ability to override `checksum/config` annotation
dexidp · Aug 30, 2021 · 8725059 · 8725059
2 parents 091e95f + 99ea561
commit 8725059
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/charts/dex/Chart.yaml b/charts/dex/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 type: application
 name: dex
-version: 0.6.0
+version: 0.6.1
 appVersion: "2.30.0"
 kubeVersion: ">=1.14.0-0"
 description: OpenID Connect (OIDC) identity and OAuth 2.0 provider with pluggable connectors.
@@ -22,7 +22,7 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: Dex v2.30.0 release
+      description: Only add `config/checksum` annotation if a config secret is created
   artifacthub.io/images: |
     - name: dex
       image: ghcr.io/dexidp/dex:v2.30.0
diff --git a/charts/dex/README.md b/charts/dex/README.md
@@ -1,6 +1,6 @@
 # dex
 
-![version: 0.6.0](https://img.shields.io/badge/version-0.6.0-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 2.30.0](https://img.shields.io/badge/app%20version-2.30.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)
+![version: 0.6.1](https://img.shields.io/badge/version-0.6.1-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 2.30.0](https://img.shields.io/badge/app%20version-2.30.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.
 

diff --git a/charts/dex/ci/no-config-secret.yaml b/charts/dex/ci/no-config-secret.yaml
@@ -0,0 +1,10 @@
+config:
+  issuer: https://my-issuer.com
+
+  storage:
+    type: memory
+
+  enablePasswordDB: true
+
+configSecret:
+  create: false
diff --git a/charts/dex/templates/deployment.yaml b/charts/dex/templates/deployment.yaml
@@ -17,7 +17,9 @@ spec:
       {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{ if .Values.configSecret.create }}
         checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
+      {{- end }}
       labels:
         {{- include "dex.selectorLabels" . | nindent 8 }}
     spec:

diff --git a/charts/dex/templates/secret.yaml b/charts/dex/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.configSecret.create }}
+{{- if .Values.configSecret.create -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,4 +8,4 @@ metadata:
 type: Opaque
 data:
   config.yaml: {{ .Values.config | toYaml | b64enc | quote }}
-{{ end }}
+{{- end }}
diff --git a/charts/dex/templates/tests/no-config-secret.yaml b/charts/dex/templates/tests/no-config-secret.yaml
@@ -0,0 +1,13 @@
+{{- if not .Values.configSecret.create -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "dex.configSecretName" . }}-test-no-create
+  labels:
+    {{- include "dex.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+type: Opaque
+data:
+  config.yaml: {{ .Values.config | toYaml | b64enc | quote }}
+{{- end }}