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

Fix ingress objects for K8s 1.19+

Browse source
This commit is contained in:
Alexander Olofsson 2021-09-05 02:54:04 +02:00
parent b8166b9a6b
commit 6421456f78
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
7 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -66,7 +66,8 @@ spec:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $service }} name: {{ $service }}
port: 8083 port:
number: 8083
{{- else }} {{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
@ -80,7 +81,8 @@ spec:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $service }} name: {{ $service }}
port: 8083 port:
number: 8083
{{- else }} {{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
@ -99,7 +101,8 @@ spec:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $service }} name: {{ $service }}
port: 8083 port:
number: 8083
{{- else }} {{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
@ -113,7 +116,8 @@ spec:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $service }} name: {{ $service }}
port: 8083 port:
number: 8083
{{- else }} {{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
@ -144,7 +148,8 @@ spec:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: 8008 port:
number: 8008
{{- else }} {{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: 8008 servicePort: 8008
@ -160,7 +165,8 @@ spec:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: 8008 port:
number: 8008
{{- else }} {{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: 8008 servicePort: 8008
@ -177,7 +183,8 @@ spec:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $wkName }} name: {{ $wkName }}
port: 80 port:
number: 80
{{- else -}} {{- else -}}
serviceName: {{ $wkName }} serviceName: {{ $wkName }}
servicePort: 80 servicePort: 80
@ -190,7 +197,8 @@ spec:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $wkName }} name: {{ $wkName }}
port: 80 port:
number: 80
{{- else }} {{- else }}
serviceName: {{ $wkName }} serviceName: {{ $wkName }}
servicePort: 80 servicePort: 80
@ -204,7 +212,8 @@ spec:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: 8008 port:
number: 8008
{{- else }} {{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: 8008 servicePort: 8008

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

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

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

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

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

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