try prefixing namespace for auth forward

This commit is contained in:
kjeld Schouten-Lebbing
2021-05-04 17:18:37 +02:00
parent 58d23d2e1a
commit 57b28dc868
4 changed files with 7 additions and 5 deletions
+1 -1
View File
@@ -984,7 +984,7 @@ class Test < ChartTest
it 'HTTP-ingressRoute+selfsigned+forwardAuth is evaluated is evaluated ' do it 'HTTP-ingressRoute+selfsigned+forwardAuth is evaluated is evaluated ' do
expectedHostString = 'Host(`hostname`) && PathPrefix(`/`)' expectedHostString = 'Host(`hostname`) && PathPrefix(`/`)'
expectedName1 = 'common-test-test1-auth-forward' expectedName1 = 'common-test-test1-auth-forward'
expectedName2 = 'common-test-test1-auth-forward@kubernetescrd' expectedName2 = 'default-common-test-test1-auth-forward@kubernetescrd'
values = { values = {
ingress: { ingress: {
test1: { test1: {
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v2 apiVersion: v2
kubeVersion: ">=1.16.0-0" kubeVersion: ">=1.16.0-0"
name: common name: common
version: 3.5.4 version: 3.5.5
# upstream_version: # upstream_version:
appVersion: none appVersion: none
description: Function library for TrueCharts description: Function library for TrueCharts
@@ -55,7 +55,7 @@ metadata:
traefik.ingress.kubernetes.io/service.serversscheme: https traefik.ingress.kubernetes.io/service.serversscheme: https
{{- end }} {{- end }}
traefik.ingress.kubernetes.io/router.entrypoints: {{ $values.entrypoint | default "websecure" }} traefik.ingress.kubernetes.io/router.entrypoints: {{ $values.entrypoint | default "websecure" }}
traefik.ingress.kubernetes.io/router.middlewares: traefik-middlewares-chain-public@kubernetescrd{{ if $values.authForwardURL }},{{ printf "%v@%v" $authForwardName "@kubernetescrd" }}{{ end }} traefik.ingress.kubernetes.io/router.middlewares: traefik-middlewares-chain-public@kubernetescrd{{ if $values.authForwardURL }},{{ printf "%v-%v@%v" .Release.Namespace $authForwardName "kubernetescrd" }}{{ end }}
{{- with $values.annotations }} {{- with $values.annotations }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
@@ -26,6 +26,8 @@ within the common library.
{{- $portProtocol = $.Values.services.main.port.protocol | default "" }} {{- $portProtocol = $.Values.services.main.port.protocol | default "" }}
{{ end -}} {{ end -}}
{{- $authForwardName := ( printf "%v-%v" $ingressName "auth-forward" ) -}}
{{- $svcName := $values.serviceName | default $ingressName -}} {{- $svcName := $values.serviceName | default $ingressName -}}
{{- if $values.servicePort }} {{- if $values.servicePort }}
@@ -81,7 +83,7 @@ spec:
middlewares: middlewares:
- name: traefik-middlewares-chain-public@kubernetescrd - name: traefik-middlewares-chain-public@kubernetescrd
{{- if $values.authForwardURL }} {{- if $values.authForwardURL }}
- name: "{{ $ingressName }}-auth-forward@kubernetescrd" - name: "{{ printf "%v-%v@%v" .Release.Namespace $authForwardName "kubernetescrd" }}"
{{- end }} {{- end }}
{{- end }} {{- end }}
@@ -108,7 +110,7 @@ spec:
apiVersion: traefik.containo.us/v1alpha1 apiVersion: traefik.containo.us/v1alpha1
kind: Middleware kind: Middleware
metadata: metadata:
name: {{ $ingressName }}-auth-forward name: {{ $authForwardName }}
spec: spec:
forwardAuth: forwardAuth:
address: {{ $values.authForwardURL | quote }} address: {{ $values.authForwardURL | quote }}