pub/charts
1
0
Fork 0
Code Issues Pull requests Releases Packages 19 Activity Actions

Merge branch 'master' of gitlab.com:ananace/charts

Browse source
This commit is contained in:
fkf9 2021-09-14 14:46:45 +02:00
commit 0f448b1e3e
9 changed files with 59 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/element-web/Chart.yaml
View file

@ -7,10 +7,10 @@ description: |
Talk to everyone through the open global Matrix network, protected by proper
end-to-end encryption.
icon: https://element.io/images/element-logo.svg
appVersion: 1.8.2
appVersion: 1.8.4
type: application
version: 1.0.33
version: 1.0.34
maintainers:
- name: Alexander Olofsson

11
charts/element-web/templates/ingress.yaml
View file

@ -1,9 +1,9 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "element-web.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
apiVersion: networking.k8s.io/v1
{{- else -}}
{{- else }}
apiVersion: networking.k8s.io/v1beta1
{{- end }}
kind: Ingress
@ -32,14 +32,15 @@ spec:
http:
paths:
- path: /
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Prefix
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $fullName }}
port: {{ $svcPort }}
port:
number: {{ $svcPort }}
{{- else }}
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}

3
charts/funkwhale/templates/ingress.yaml
View file

@ -41,7 +41,8 @@ spec:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $fullName }}
port: http
port:
name: http
{{- else }}
serviceName: {{ $fullName }}
servicePort: http

3
charts/matrix-media-repo/templates/ingress.yaml
View file

@ -40,7 +40,8 @@ spec:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $fullName }}
port: {{ $svcPort }}
port:
number: {{ $svcPort }}
{{- else }}
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}

4
charts/matrix-synapse/Chart.yaml
View file

@ -3,10 +3,10 @@ apiVersion: v2
name: matrix-synapse
description: Matrix reference homeserver
icon: https://matrix.org/images/matrix-logo.svg
appVersion: 1.41.1
appVersion: 1.42.0
type: application
version: 2.1.8
version: 2.1.9
maintainers:
- name: Alexander Olofsson
email: ace@haxalot.com

69
charts/matrix-synapse/templates/ingress.yaml
View file

@ -1,9 +1,9 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "matrix-synapse.fullname" . -}}
{{- $wkName := include "matrix-synapse.externalname" (dict "global" . "external" "wellknown-lighttpd") -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
apiVersion: networking.k8s.io/v1
{{- else -}}
{{- else }}
apiVersion: networking.k8s.io/v1beta1
{{- end }}
kind: Ingress
@ -59,28 +59,30 @@ spec:
{{- range $config.csPaths }}
{{- if $.Values.ingress.traefikPaths }}
- path: {{ printf "/{path:%s}" (trimPrefix "/" .) | quote }}
{{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $service }}
port: 8083
port:
number: 8083
{{- else }}
serviceName: {{ $service }}
servicePort: 8083
{{- end }}
{{- else }}
- path: {{ . | quote }}
{{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $service }}
port: 8083
port:
number: 8083
{{- else }}
serviceName: {{ $service }}
servicePort: 8083
@ -92,28 +94,30 @@ spec:
{{- range $config.paths }}
{{- if $.Values.ingress.traefikPaths }}
- path: {{ printf "/{path:%s}" (trimPrefix "/" .) | quote }}
{{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $service }}
port: 8083
port:
number: 8083
{{- else }}
serviceName: {{ $service }}
servicePort: 8083
{{- end }}
{{- else }}
- path: {{ . | quote }}
{{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $service }}
port: 8083
port:
number: 8083
{{- else }}
serviceName: {{ $service }}
servicePort: 8083
@ -137,14 +141,15 @@ spec:
{{- if or (has . $csHosts) (has . $s2sHosts) }}
- path: /_matrix
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Prefix
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $fullName }}
port: 8008
port:
number: 8008
{{- else }}
serviceName: {{ $fullName }}
servicePort: 8008
@ -153,14 +158,15 @@ spec:
{{- if and (has . $csHosts) $.Values.ingress.includeUnderscoreSynapse }}
- path: /_synapse
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Prefix
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $fullName }}
port: 8008
port:
number: 8008
{{- else }}
serviceName: {{ $fullName }}
servicePort: 8008
@ -170,41 +176,44 @@ spec:
{{- if has . $wkHosts }}
{{- if $.Values.wellknown.enabled }}
- path: /.well-known/matrix/client
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Exact
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $wkName }}
port: 80
{{- else -}}
port:
number: 80
{{- else }}
serviceName: {{ $wkName }}
servicePort: 80
{{- end }}
- path: /.well-known/matrix/server
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Exact
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $wkName }}
port: 80
port:
number: 80
{{- else }}
serviceName: {{ $wkName }}
servicePort: 80
{{- end }}
{{- else }}
- path: /.well-known/matrix/client
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Exact
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $fullName }}
port: 8008
port:
number: 8008
{{- else }}
serviceName: {{ $fullName }}
servicePort: 8008

3
charts/matrix-synapse/values.yaml
View file

@ -780,7 +780,8 @@ ingress:
# backend:
# service:
# name: matrix-media-repo
# port: 8000
# port:
# number: 8000
# # K8s <1.19
# - path: /_matrix/media
# backend:

3
charts/netbox/templates/ingress.yaml
View file

@ -43,7 +43,8 @@ spec:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $fullName }}
port: http
port:
name: http
{{- else }}
serviceName: {{ $fullName }}
servicePort: http

3
charts/radosgw/templates/ingress.yaml
View file

@ -37,7 +37,8 @@ spec:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $fullName }}
port: http
port:
name: http
{{- else }}
serviceName: {{ $fullName }}
servicePort: http