Traefik fixes (#659)

* fix chain middleware for traefik

* try adding portal button fix to dynamically fetch traefik port

* try hook quote

* correctly quote namespace name

* common version bump
This commit is contained in:
Kjeld Schouten-Lebbing
2021-07-05 18:13:44 +02:00
committed by GitHub
parent e4794ca02b
commit 224efec466
7 changed files with 33 additions and 5 deletions
+1 -1
View File
@@ -18,4 +18,4 @@ maintainers:
name: common
sources:
type: library
version: 6.5.1
version: 6.5.2
@@ -10,6 +10,7 @@
{{- $protocol := "https" }}
{{- $portProtocol := "" }}
{{- $path := "/" }}
{{- $ingressport := 443 }}
{{- if $ingr }}
{{- if $ingr.enabled }}
@@ -28,8 +29,17 @@
{{- end }}
{{- end }}
{{- if and ( .Values.portal.ingressPort ) ( ne $host "$node_ip" ) }}
{{- $port = .Values.portal.ingressPort }}
{{- $traefikportalhook := lookup "v1" "ConfigMap" "traefikmiddlewares" "portalhook" }}
{{- if .Values.portal.ingressPort }}
{{- $ingressport = .Values.portal.ingressPort }}
{{- else if $traefikportalhook }}
{{- if $traefikportalhook.data.websecureport }}
{{- $ingressport = ( index $traefikportalhook.data "websecureport" ) }}
{{- end }}
{{- end }}
{{- if ne $host "$node_ip" }}
{{- $port = $ingressport }}
{{- else if eq $host "$node_ip" }}
{{- if eq $primaryService.type "NodePort" }}
{{- $port = $primaryPort.nodePort }}