From 17bc7c107348c9e356da69db736dab363a56ed54 Mon Sep 17 00:00:00 2001 From: James Elliott Date: Mon, 8 Mar 2021 08:03:52 +1100 Subject: [PATCH] fix(authelia): only enable tls secret name when certresolver not configured (#6) --- .buildkite/ct.yaml | 2 +- .buildkite/scripts/pipeline.sh | 4 ++-- charts/authelia/Chart.yaml | 2 +- charts/authelia/templates/traefikCRD/ingressRoute.yaml | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.buildkite/ct.yaml b/.buildkite/ct.yaml index fced2fe..ebba792 100644 --- a/.buildkite/ct.yaml +++ b/.buildkite/ct.yaml @@ -5,7 +5,7 @@ chart-repos: check-version-increment: true chart-yaml-schema: .buildkite/chart_schema.yaml exclude-deprecated: true -excluded-charts: [ ] +excluded-charts: [] lint-conf: .yamllint.yaml remote: origin since: HEAD diff --git a/.buildkite/scripts/pipeline.sh b/.buildkite/scripts/pipeline.sh index 875bf50..ffd937e 100755 --- a/.buildkite/scripts/pipeline.sh +++ b/.buildkite/scripts/pipeline.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash if [[ $BUILDKITE_BRANCH == "master" ]]; then - export CR_BYPASS=$(git diff --name-only HEAD~1 | sed -rn '/^charts\/[a-zA-Z0-9-]+\/(templates\/.*|crds\/.*|Chart.yaml|values.yaml|values.schema.json|LICENSE|README.md)/!{q1}' && echo false || echo true) + export CR_BYPASS=$(git diff --name-only HEAD~1 | sed -rn '/^charts\/[a-zA-Z0-9-]+\/(templates\/.*|crds\/.*|Chart.yaml|values.yaml|values.schema.json|LICENSE|README.md)/{q1}' && echo true || echo false) else - export CR_BYPASS=$(git diff --name-only `git merge-base --fork-point origin/master` | sed -rn '/^charts\/[a-zA-Z0-9-]+\/(templates\/.*|crds\/.*|Chart.yaml|values.yaml|values.schema.json|LICENSE|README.md)/!{q1}' && echo false || echo true) + export CR_BYPASS=true fi envsubst < .buildkite/pipeline.yaml \ No newline at end of file diff --git a/charts/authelia/Chart.yaml b/charts/authelia/Chart.yaml index 7a24538..582e873 100644 --- a/charts/authelia/Chart.yaml +++ b/charts/authelia/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: authelia -version: 0.2.10 +version: 0.2.11 kubeVersion: ">= 1.13.0-0" description: Authelia is a Single Sign-On Multi-Factor portal for web apps type: application diff --git a/charts/authelia/templates/traefikCRD/ingressRoute.yaml b/charts/authelia/templates/traefikCRD/ingressRoute.yaml index 5f0a904..77e6267 100644 --- a/charts/authelia/templates/traefikCRD/ingressRoute.yaml +++ b/charts/authelia/templates/traefikCRD/ingressRoute.yaml @@ -40,7 +40,9 @@ spec: {{- end }} {{- if .Values.ingress.tls.enabled }} tls: + {{- if not .Values.ingress.traefikCRD.tls.certResolver }} secretName: {{ default (printf "%s-traefik-tls" (include "authelia.name" .)) .Values.ingress.tls.secret }} + {{- end }} options: {{- if (include "authelia.existing.ingress.traefik.tlsOption" .) }} {{- toYaml .Values.ingress.traefikCRD.tls.existingOptions | nindent 6 }}