From f1dbdf00594a3f3d2d1534daaeb2beda65e19f01 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 4 Sep 2021 00:12:58 +0200
Subject: [PATCH] Bump some incubator apps and remove common test code. Also
 render traefik portalhook as tpl

---
 charts/incubator/jdownloader2/Chart.yaml                      | 4 ++--
 charts/incubator/traefik/Chart.yaml                           | 4 ++--
 .../traefik/templates/{portalhook.yaml => _portalhook.tpl}    | 3 +++
 charts/incubator/traefik/templates/common.yaml                | 1 +
 charts/library/common/Chart.yaml                              | 2 +-
 charts/library/common/templates/configmaps/_portal.tpl        | 4 ----
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename charts/incubator/traefik/templates/{portalhook.yaml => _portalhook.tpl} (89%)

diff --git a/charts/incubator/jdownloader2/Chart.yaml b/charts/incubator/jdownloader2/Chart.yaml
index 6b085c89c06..6d5003f5e0a 100644
--- a/charts/incubator/jdownloader2/Chart.yaml
+++ b/charts/incubator/jdownloader2/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: auto
 dependencies:
 - name: common
   repository: https://truecharts.org/
-  version: 6.12.4
+  version: 6.13.5
 deprecated: false
 description: JDownloader is a free, open-source download management tool with a huge
   community of developers that makes downloading as easy and fast as it should be.
@@ -26,4 +26,4 @@ sources:
 - https://hub.docker.com/r/jlesage/jdownloader-2
 - https://jdownloader.org/
 type: application
-version: 0.3.11
+version: 0.3.12
diff --git a/charts/incubator/traefik/Chart.yaml b/charts/incubator/traefik/Chart.yaml
index 7699b4bea1d..fa7f7f3764c 100644
--- a/charts/incubator/traefik/Chart.yaml
+++ b/charts/incubator/traefik/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: '2.4'
 dependencies:
 - name: common
   repository: https://truecharts.org/
-  version: 6.13.4
+  version: 6.13.5
 deprecated: false
 description: Test App for Traefik
 home: https://github.com/truecharts/apps/tree/master/charts/stable/traefik
@@ -22,4 +22,4 @@ sources:
 - https://github.com/traefik/traefik-helm-chart
 - https://traefik.io/
 type: application
-version: 0.0.11
+version: 0.0.12
diff --git a/charts/incubator/traefik/templates/portalhook.yaml b/charts/incubator/traefik/templates/_portalhook.tpl
similarity index 89%
rename from charts/incubator/traefik/templates/portalhook.yaml
rename to charts/incubator/traefik/templates/_portalhook.tpl
index 886b69510b6..6d12bc39776 100644
--- a/charts/incubator/traefik/templates/portalhook.yaml
+++ b/charts/incubator/traefik/templates/_portalhook.tpl
@@ -1,3 +1,5 @@
+{{/* Define the portalHook */}}
+{{- define "traefik.portalhook" -}}
 {{- if .Values.portalhook.enabled }}
 {{- $namespace := ( printf "ix-%s" .Release.Name ) }}
 {{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
@@ -22,3 +24,4 @@ data:
   {{ $name }}: {{ $value.port | quote }}
   {{- end }}
 {{- end }}
+{{- end -}}
diff --git a/charts/incubator/traefik/templates/common.yaml b/charts/incubator/traefik/templates/common.yaml
index 7146fcb4135..a3ba841bdd7 100644
--- a/charts/incubator/traefik/templates/common.yaml
+++ b/charts/incubator/traefik/templates/common.yaml
@@ -14,6 +14,7 @@
 {{- $mergedargs := concat .Values.args .Values.newArgs.args }}
 {{- $_ := set .Values "args" $mergedargs -}}
 
+{{- include "traefik.portalhook" . }}
 {{- include "traefik.tlsOptions" . }}
 {{- include "traefik.ingressRoute" . }}
 {{- include "traefik.ingressClass" . }}
diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index c1294f726b2..74b44dccd04 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 6.13.5
+version: 6.13.6
diff --git a/charts/library/common/templates/configmaps/_portal.tpl b/charts/library/common/templates/configmaps/_portal.tpl
index b1b90e78e06..9889ddb62ed 100644
--- a/charts/library/common/templates/configmaps/_portal.tpl
+++ b/charts/library/common/templates/configmaps/_portal.tpl
@@ -10,13 +10,10 @@
 {{- $protocol := "https" }}
 {{- $path := "/" }}
 {{- $ingressport := 443 }}
-{{- $test := "" }}
 
 {{- if $ingr }}
   {{- if $ingr.enabled }}
-    {{- $test = "blabla" }}
     {{- range $ingr.hosts }}
-
       {{- if .hostTpl }}
         {{ $host = ( tpl .hostTpl $ ) }}
       {{- else if .host }}
@@ -88,7 +85,6 @@ metadata:
   annotations:
     rollme: {{ randAlphaNum 5 | quote }}
 data:
-  test: {{ $test | quote }}
   protocol: {{ $protocol }}
   host: {{ $host | quote }}
   port: {{ $port | quote }}