8000 remove Ingress api version switch logic by wkloucek · Pull Request #34 · cs3org/charts · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

remove Ingress api version switch logic #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 20, 2022
Merged

remove Ingress api version switch logic #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64e2531
remove Ingress api version switch logic
wkloucek Jul 20, 2022
cee585d
update chart.yaml
wkloucek Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions revad/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ apiVersion: v2
name: revad
description: The Reva daemon (revad) helm chart
type: application
version: 1.3.3
version: 1.4.0
appVersion: v1.18.0
kubeVersion: ">= 1.14.0"
kubeVersion: ">= 1.19.0"
icon: https://reva.link/logo.svg
home: https://reva.link
sources:
Expand Down
12 changes: 0 additions & 12 deletions revad/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,6 @@ app.kubernetes.io/name: {{ include "revad.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}


{{/*
Return the appropriate apiVersion for ingress.
*/}}
{{- define "revad.ingress.apiVersion" -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/ingress" }}
{{- print "networking.k8s.io/v1" -}}
{{- else }}
{{- print "networking.k8s.io/v1beta1" -}}
{{- end }}
{{- end -}}

{{/*
Create the name of the service account to use
*/}}
Expand Down
7 changes: 1 addition & 6 deletions revad/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.ingress.enabled }}
{{- range $service, $ingress := .Values.ingress.services }}
apiVersion: {{ template "revad.ingress.apiVersion" $ }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ template "revad.fullname" $ }}-{{ $service }}
Expand All @@ -17,16 +17,11 @@ spec:
paths:
- path: {{ $ingress.path }}
backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/ingress" }}
service:
name: {{ template "revad.fullname" $ }}
port:
name: {{ $service }}
pathType: ImplementationSpecific
{{- else }}
serviceName: {{ template "revad.fullname" $ }}
servicePort: {{ $service }}
{{- end }}
{{- end }}
{{- if $ingress.tls }}
tls:
Expand Down
4 changes: 2 additions & 2 deletions wopiserver/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ apiVersion: v2
name: wopiserver
description: A Vendor-neutral Web-application Open Platform Interface (WOPI) gateway for EFSS systems
type: application
version: 0.3.0
version: 0.4.0
appVersion: v6.7.0
kubeVersion: ">= 1.14.0"
kubeVersion: ">= 1.19.0"
home: https://github.com/cs3org/wopiserver
sources:
- https://github.com/cs3org/wopiserver
Expand Down
11 changes: 0 additions & 11 deletions wopiserver/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,6 @@ app.kubernetes.io/name: {{ include "wopiserver.name" . }}-{{ .Values.wopibridge.
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}

{{/*
Return the appropriate apiVersion for ingress.
*/}}
{{- define "wopiserver.ingress.apiVersion" -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/ingress" }}
{{- print "networking.k8s.io/v1" -}}
{{- else }}
{{- print "networking.k8s.io/v1beta1" -}}
{{- end }}
{{- end -}}

{{/*
Returns the WOPI Server external URL
*/}}
Expand Down
7 changes: 1 addition & 6 deletions wopiserver/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if .Values.ingress.enabled }}
apiVersion: {{ template "wopiserver.ingress.apiVersion" . }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ template "wopiserver.fullname" . }}
Expand All @@ -16,16 +16,11 @@ spec:
paths:
- path: {{ .Values.ingress.path }}
backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/ingress" }}
service:
name: {{ template "wopiserver.fullname" . }}
port:
name: http
pathType: ImplementationSpecific
{{- else }}
serviceName: {{ template "wopiserver.fullname" . }}
servicePort: http
{{- end }}
{{- end }}
{{- if .Values.ingress.tls }}
tls:
Expand Down
7 changes: 1 addition & 6 deletions wopiserver/templates/wopibridge/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- with .Values.wopibridge }}
{{- if and .enabled .ingress.enabled }}
apiVersion: {{ template "wopiserver.ingress.apiVersion" $ }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ template "wopiserver.fullname" $ }}-{{ .name }}
Expand All @@ -17,16 +17,11 @@ spec:
paths:
- path: {{ .ingress.path }}
backend:
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/ingress" }}
service:
name: {{ template "wopiserver.fullname" $ }}-{{ .name }}
port:
name: http
pathType: ImplementationSpecific
{{- else }}
serviceName: {{ template "wopiserver.fullname" $ }}-{{ .name }}
servicePort: http
{{- end }}
{{- end }}
{{- if .ingress.tls }}
tls:
Expand Down
0