From 224efec4668ecb69b13dbdd16af4e2972fd3d8a6 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 5 Jul 2021 18:13:44 +0200
Subject: [PATCH] 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
---
 charts/library/common/Chart.yaml                   |  2 +-
 .../library/common/templates/classes/_portal.tpl   | 14 ++++++++++++--
 charts/stable/traefik/Chart.yaml                   |  2 +-
 charts/stable/traefik/SCALE/ix_values.yaml         |  3 +++
 .../templates/custom/middlewares/chain.yaml        |  2 +-
 .../traefik/templates/custom/portalhook.yaml       | 12 ++++++++++++
 charts/stable/traefik/values.yaml                  |  3 +++
 7 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 charts/stable/traefik/templates/custom/portalhook.yaml

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index c1c01131148..1c1f06cc4fc 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources:
 type: library
-version: 6.5.1
+version: 6.5.2
diff --git a/charts/library/common/templates/classes/_portal.tpl b/charts/library/common/templates/classes/_portal.tpl
index 782aa36e706..edb3fff1add 100644
--- a/charts/library/common/templates/classes/_portal.tpl
+++ b/charts/library/common/templates/classes/_portal.tpl
@@ -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 }}
diff --git a/charts/stable/traefik/Chart.yaml b/charts/stable/traefik/Chart.yaml
index 5834f1bb7b5..56bb02e5199 100644
--- a/charts/stable/traefik/Chart.yaml
+++ b/charts/stable/traefik/Chart.yaml
@@ -26,4 +26,4 @@ sources:
 - https://traefik.io/
 type: application
 upstream_version: v9.19.2
-version: 6.5.4
+version: 6.5.5
diff --git a/charts/stable/traefik/SCALE/ix_values.yaml b/charts/stable/traefik/SCALE/ix_values.yaml
index b8247bf1ca9..0a43b81babd 100644
--- a/charts/stable/traefik/SCALE/ix_values.yaml
+++ b/charts/stable/traefik/SCALE/ix_values.yaml
@@ -327,3 +327,6 @@ priorityClassName: ""
 securityContext:
   capabilities:
     drop: [ALL]
+
+portalhook:
+  enabled: true
diff --git a/charts/stable/traefik/templates/custom/middlewares/chain.yaml b/charts/stable/traefik/templates/custom/middlewares/chain.yaml
index b6850029d3e..ef592c255ba 100644
--- a/charts/stable/traefik/templates/custom/middlewares/chain.yaml
+++ b/charts/stable/traefik/templates/custom/middlewares/chain.yaml
@@ -11,6 +11,6 @@ spec:
   chain:
     middlewares:
       {{ range $index, $chainData := .Values.middlewares.chainmiddlewares }}
-      - name: {{ $chainData.name }}
+      - name: {{ printf "%v-%v@%v" "traefikmiddlewares" $chainData.name "kubernetescrd" }}
       {{ end }}
 {{ end }}
diff --git a/charts/stable/traefik/templates/custom/portalhook.yaml b/charts/stable/traefik/templates/custom/portalhook.yaml
new file mode 100644
index 00000000000..5a9fee80da4
--- /dev/null
+++ b/charts/stable/traefik/templates/custom/portalhook.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.portalhook.enabled }}
+
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: portalhook
+  namespace: traefikmiddlewares
+data:
+  websecureport: {{ .Values.ports.websecure.exposedPort | quote }}
+{{- end }}
diff --git a/charts/stable/traefik/values.yaml b/charts/stable/traefik/values.yaml
index 33d641df83c..596cc786695 100644
--- a/charts/stable/traefik/values.yaml
+++ b/charts/stable/traefik/values.yaml
@@ -433,3 +433,6 @@ middlewares:
   rateLimit: []
   #  average: 300
   #  burst: 200
+
+portalhook:
+  enabled: true