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

Clean up v1 ingress handling

Browse source
This commit is contained in:
Alexander Olofsson 2021-09-15 09:45:55 +02:00
parent 296671af42
commit 8b8606d67b
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
6 changed files with 75 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,10 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "element-web.fullname" . -}} {{- $fullName := include "element-web.fullname" . -}}
{{- $svcPort := .Values.service.port -}} {{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} {{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
{{- if $v1Ingress -}}
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
@ -32,18 +33,16 @@ spec:
http: http:
paths: paths:
- path: / - path: /
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Prefix
{{- end }}
backend: backend:
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:
number: {{ $svcPort }} number: {{ $svcPort }}
{{- else }} pathType: Prefix
{{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: {{ $svcPort }} servicePort: {{ $svcPort }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

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

@ -1,7 +1,7 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "funkwhale.fullname" . -}} {{- $fullName := include "funkwhale.fullname" . -}}
--- {{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if $v1Ingress -}}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
{{- else -}} {{- else -}}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
@ -34,17 +34,15 @@ spec:
http: http:
paths: paths:
- path: / - path: /
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: Prefix
{{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:
name: http name: http
{{- else }} pathType: Prefix
{{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: http servicePort: http
{{- end }} {{- end }}
{{- end }} {{- end }}

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

@ -1,7 +1,8 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "matrix-media-repo.fullname" . -}} {{- $fullName := include "matrix-media-repo.fullname" . -}}
{{- $svcPort := .Values.service.port -}} {{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
{{- if $v1Ingress -}}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
{{- else -}} {{- else -}}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
@ -27,25 +28,23 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
rules: rules:
{{- range .Values.ingress.hosts }} {{- range .Values.ingress.hosts }}
- host: {{ .host | quote }} - host: {{ .host | quote }}
http: http:
paths: paths:
{{- range .paths }} {{- range .paths }}
- path: {{ . }} - path: {{ . }}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific
{{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:
number: {{ $svcPort }} number: {{ $svcPort }}
{{- else }} pathType: ImplementationSpecific
{{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: {{ $svcPort }} servicePort: {{ $svcPort }}
{{- end }} {{- end }}
{{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }}

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

@ -1,9 +1,10 @@
{{- 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 }} {{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
{{- if $v1Ingress -}}
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
@ -59,34 +60,30 @@ spec:
{{- range $config.csPaths }} {{- range $config.csPaths }}
{{- if $.Values.ingress.traefikPaths }} {{- if $.Values.ingress.traefikPaths }}
- path: {{ printf "/{path:%s}" (trimPrefix "/" .) | quote }} - path: {{ printf "/{path:%s}" (trimPrefix "/" .) | quote }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific
{{- end }}
backend: backend:
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $service }} name: {{ $service }}
port: port:
number: 8083 number: 8083
{{- else }} pathType: ImplementationSpecific
{{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
{{- end }} {{- end }}
{{- else }} {{- else }}
- path: {{ . | quote }} - path: {{ . | quote }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific
{{- end }}
backend: backend:
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $service }} name: {{ $service }}
port: port:
number: 8083 number: 8083
{{- else }} pathType: ImplementationSpecific
{{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
@ -94,34 +91,30 @@ spec:
{{- range $config.paths }} {{- range $config.paths }}
{{- if $.Values.ingress.traefikPaths }} {{- if $.Values.ingress.traefikPaths }}
- path: {{ printf "/{path:%s}" (trimPrefix "/" .) | quote }} - path: {{ printf "/{path:%s}" (trimPrefix "/" .) | quote }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific
{{- end }}
backend: backend:
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $service }} name: {{ $service }}
port: port:
number: 8083 number: 8083
{{- else }} pathType: ImplementationSpecific
{{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
{{- end }} {{- end }}
{{- else }} {{- else }}
- path: {{ . | quote }} - path: {{ . | quote }}
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific
{{- end }}
backend: backend:
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $service }} name: {{ $service }}
port: port:
number: 8083 number: 8083
{{- else }} pathType: ImplementationSpecific
{{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
@ -141,84 +134,74 @@ 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 }}
pathType: Prefix
{{- end }}
backend: backend:
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:
number: 8008 number: 8008
{{- else }} pathType: Prefix
{{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: 8008 servicePort: 8008
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- 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 }}
pathType: Prefix
{{- end }}
backend: backend:
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:
number: 8008 number: 8008
{{- else }} pathType: Prefix
{{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: 8008 servicePort: 8008
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- 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 }}
pathType: Exact
{{- end }}
backend: backend:
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $wkName }} name: {{ $wkName }}
port: port:
number: 80 number: 80
{{- else }} pathType: Exact
{{- 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 }}
pathType: Exact
{{- end }}
backend: backend:
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $wkName }} name: {{ $wkName }}
port: port:
number: 80 number: 80
{{- else }} pathType: Exact
{{- else }}
serviceName: {{ $wkName }} serviceName: {{ $wkName }}
servicePort: 80 servicePort: 80
{{- end }} {{- end }}
{{- else }} {{- else }}
- path: /.well-known/matrix/client - path: /.well-known/matrix/client
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Exact
{{- end }}
backend: backend:
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:
number: 8008 number: 8008
{{- else }} pathType: Exact
{{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: 8008 servicePort: 8008
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

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

@ -1,6 +1,7 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "netbox.fullname" . -}} {{- $fullName := include "netbox.fullname" . -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
{{- if $v1Ingress -}}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
{{- else -}} {{- else -}}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
@ -36,18 +37,16 @@ spec:
http: http:
paths: paths:
- path: / - path: /
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: Prefix
{{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:
name: http name: http
{{- else }} pathType: Prefix
{{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: http servicePort: http
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

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

@ -1,6 +1,7 @@
{{- if .Values.ingress.enabled -}} {{- if .Values.ingress.enabled -}}
{{- $fullName := include "radosgw.fullname" . -}} {{- $fullName := include "radosgw.fullname" . -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- $v1Ingress := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
{{- if $v1Ingress -}}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
{{- else -}} {{- else -}}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
@ -30,17 +31,15 @@ spec:
http: http:
paths: paths:
- path: / - path: /
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: Prefix
{{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} {{- if $v1Ingress }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: port:
name: http name: http
{{- else }} pathType: Prefix
{{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: http servicePort: http
{{- end }} {{- end }}
{{- end }} {{- end }}