Skip to content

Commit

Permalink
fix(authelia): only enable tls secret name when certresolver not conf…
Browse files Browse the repository at this point in the history
…igured (#6)
  • Loading branch information
james-d-elliott committed Mar 7, 2021
1 parent 756122b commit 17bc7c1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .buildkite/ct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/scripts/pipeline.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion charts/authelia/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions charts/authelia/templates/traefikCRD/ingressRoute.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down

0 comments on commit 17bc7c1

Please sign in to comment.