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

This commit is contained in:
Alexander Olofsson 2021-09-11 14:59:18 +02:00
commit 32fb1cf868

View file

@ -1,9 +1,9 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "matrix-synapse.fullname" . -}} {{- $fullName := include "matrix-synapse.fullname" . -}}
{{- $wkName := include "matrix-synapse.externalname" (dict "global" . "external" "wellknown-lighttpd") -}} {{- $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 apiVersion: networking.k8s.io/v1
{{- else -}} {{- else }}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
{{- end }} {{- end }}
kind: Ingress kind: Ingress
@ -63,7 +63,7 @@ spec:
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end }} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $service }} name: {{ $service }}
port: port:
@ -78,7 +78,7 @@ spec:
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end }} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $service }} name: {{ $service }}
port: port:
@ -98,7 +98,7 @@ spec:
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end }} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $service }} name: {{ $service }}
port: port:
@ -113,7 +113,7 @@ spec:
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end }} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $service }} name: {{ $service }}
port: port:
@ -141,11 +141,11 @@ spec:
{{- if or (has . $csHosts) (has . $s2sHosts) }} {{- if or (has . $csHosts) (has . $s2sHosts) }}
- path: /_matrix - path: /_matrix
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Prefix pathType: Prefix
{{- end }} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:
@ -158,11 +158,11 @@ spec:
{{- if and (has . $csHosts) $.Values.ingress.includeUnderscoreSynapse }} {{- if and (has . $csHosts) $.Values.ingress.includeUnderscoreSynapse }}
- path: /_synapse - path: /_synapse
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Prefix pathType: Prefix
{{- end }} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:
@ -176,25 +176,25 @@ spec:
{{- if has . $wkHosts }} {{- if has . $wkHosts }}
{{- if $.Values.wellknown.enabled }} {{- if $.Values.wellknown.enabled }}
- path: /.well-known/matrix/client - path: /.well-known/matrix/client
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Exact pathType: Exact
{{- end }} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $wkName }} name: {{ $wkName }}
port: port:
number: 80 number: 80
{{- else -}} {{- else }}
serviceName: {{ $wkName }} serviceName: {{ $wkName }}
servicePort: 80 servicePort: 80
{{- end }} {{- end }}
- path: /.well-known/matrix/server - path: /.well-known/matrix/server
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Exact pathType: Exact
{{- end }} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $wkName }} name: {{ $wkName }}
port: port:
@ -205,11 +205,11 @@ spec:
{{- end }} {{- end }}
{{- else }} {{- else }}
- path: /.well-known/matrix/client - path: /.well-known/matrix/client
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Exact pathType: Exact
{{- end }} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port: