From 74dab6265608af009bd1b6b119a6cbea991ef334 Mon Sep 17 00:00:00 2001 From: Hector Fernandez Date: Mon, 22 Jul 2019 15:20:31 +0200 Subject: [PATCH] dex-k8s-authenticator: avoid using subPath for the secret --- staging/dex-k8s-authenticator/Chart.yaml | 4 ++-- .../templates/deployment.yaml | 6 ++++-- staging/dex-k8s-authenticator/values.yaml | 20 +++++++++---------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/staging/dex-k8s-authenticator/Chart.yaml b/staging/dex-k8s-authenticator/Chart.yaml index 332699502..ea3e3d55d 100644 --- a/staging/dex-k8s-authenticator/Chart.yaml +++ b/staging/dex-k8s-authenticator/Chart.yaml @@ -2,12 +2,12 @@ apiVersion: v1 appVersion: "v1.1.0" description: "Authenticator for using Dex with Kubernetes" name: dex-k8s-authenticator -version: 1.1.3 +version: 1.1.4 +home: https://github.com/mesosphere/charts sources: - https://github.com/mintel/dex-k8s-authenticator maintainers: - name: Martin Hrabovcin - email: mhrabovcin.c@mesosphere.com # Original maintainers from `mintel/dex-k8s-authenticator` repository - name: Aaron Roydhouse email: aaron@roydhouse.com diff --git a/staging/dex-k8s-authenticator/templates/deployment.yaml b/staging/dex-k8s-authenticator/templates/deployment.yaml index 4419443be..6714a74f4 100644 --- a/staging/dex-k8s-authenticator/templates/deployment.yaml +++ b/staging/dex-k8s-authenticator/templates/deployment.yaml @@ -63,8 +63,7 @@ spec: {{- if .Values.caCerts.enabled }} {{- range .Values.caCerts.secrets }} - name: {{ template "dex-k8s-authenticator.fullname" $ }}-{{ .name }} - subPath: {{ .name }} - mountPath: /certs/{{ .filename }} + mountPath: /certs/ {{- end }} {{- end }} resources: @@ -93,5 +92,8 @@ spec: - name: {{ template "dex-k8s-authenticator.fullname" $ }}-{{ .name }} secret: secretName: {{ template "dex-k8s-authenticator.fullname" $ }}-{{ .name }} + items: + - key: {{ .name }} + path: {{ .filename }} {{- end }} {{- end }} diff --git a/staging/dex-k8s-authenticator/values.yaml b/staging/dex-k8s-authenticator/values.yaml index 39e9954d8..d47e2049e 100644 --- a/staging/dex-k8s-authenticator/values.yaml +++ b/staging/dex-k8s-authenticator/values.yaml @@ -21,9 +21,9 @@ dexK8sAuthenticator: periodSeconds: 10 initialDelaySeconds: 10 web_path_prefix: / - #logoUrl: http:// - #tlsCert: /path/to/dex-client.crt - #tlsKey: /path/to/dex-client.key + # logoUrl: http:// + # tlsCert: /path/to/dex-client.crt + # tlsKey: /path/to/dex-client.key clusters: - name: my-cluster short_description: "My Cluster" @@ -84,13 +84,13 @@ caCerts: # # value: The base64 encoded value of the CA # - #secrets: - #- name: ca-cert1 - # filename: ca1.crt - # value: LS0tLS1......X2F - #- name: ca-cert2 - # filename: ca2.crt - # value: DS1tFA1......X2F + # secrets: + # - name: ca-cert1 + # filename: ca1.crt + # value: LS0tLS1......X2F + # - name: ca-cert2 + # filename: ca2.crt + # value: DS1tFA1......X2F nodeSelector: {}