try prefixing namespace for auth forward
This commit is contained in:
parent
58d23d2e1a
commit
57b28dc868
|
@ -984,7 +984,7 @@ class Test < ChartTest
|
|||
it 'HTTP-ingressRoute+selfsigned+forwardAuth is evaluated is evaluated ' do
|
||||
expectedHostString = 'Host(`hostname`) && PathPrefix(`/`)'
|
||||
expectedName1 = 'common-test-test1-auth-forward'
|
||||
expectedName2 = 'common-test-test1-auth-forward@kubernetescrd'
|
||||
expectedName2 = 'default-common-test-test1-auth-forward@kubernetescrd'
|
||||
values = {
|
||||
ingress: {
|
||||
test1: {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
apiVersion: v2
|
||||
kubeVersion: ">=1.16.0-0"
|
||||
name: common
|
||||
version: 3.5.4
|
||||
version: 3.5.5
|
||||
# upstream_version:
|
||||
appVersion: none
|
||||
description: Function library for TrueCharts
|
||||
|
|
|
@ -55,7 +55,7 @@ metadata:
|
|||
traefik.ingress.kubernetes.io/service.serversscheme: https
|
||||
{{- end }}
|
||||
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 }}
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
|
|
|
@ -26,6 +26,8 @@ within the common library.
|
|||
{{- $portProtocol = $.Values.services.main.port.protocol | default "" }}
|
||||
{{ end -}}
|
||||
|
||||
{{- $authForwardName := ( printf "%v-%v" $ingressName "auth-forward" ) -}}
|
||||
|
||||
{{- $svcName := $values.serviceName | default $ingressName -}}
|
||||
|
||||
{{- if $values.servicePort }}
|
||||
|
@ -81,7 +83,7 @@ spec:
|
|||
middlewares:
|
||||
- name: traefik-middlewares-chain-public@kubernetescrd
|
||||
{{- if $values.authForwardURL }}
|
||||
- name: "{{ $ingressName }}-auth-forward@kubernetescrd"
|
||||
- name: "{{ printf "%v-%v@%v" .Release.Namespace $authForwardName "kubernetescrd" }}"
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
|
@ -108,7 +110,7 @@ spec:
|
|||
apiVersion: traefik.containo.us/v1alpha1
|
||||
kind: Middleware
|
||||
metadata:
|
||||
name: {{ $ingressName }}-auth-forward
|
||||
name: {{ $authForwardName }}
|
||||
spec:
|
||||
forwardAuth:
|
||||
address: {{ $values.authForwardURL | quote }}
|
||||
|
|
Loading…
Reference in New Issue