Bump some incubator apps and remove common test code. Also render traefik portalhook as tpl
This commit is contained in:
parent
fa1b2e05c8
commit
f1dbdf0059
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 -}}
|
|
@ -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" . }}
|
||||
|
|
|
@ -18,4 +18,4 @@ maintainers:
|
|||
name: common
|
||||
sources: null
|
||||
type: library
|
||||
version: 6.13.5
|
||||
version: 6.13.6
|
||||
|
|
|
@ -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 }}
|
||||
|
|
Loading…
Reference in New Issue