EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit 6b591901 authored by Bernhard Mallinger's avatar Bernhard Mallinger
Browse files

Ensure compatiblity with production cluster (k8s 1.18)

parent ebbd2044
No related branches found
No related tags found
1 merge request!62Backporting
......@@ -7,7 +7,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.3.19
version: 0.3.21
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
......
{{- $fullName := include "vs.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta
{{- else -}}
apiVersion: extensions/v1
{{- end }}
......@@ -28,6 +30,7 @@ spec:
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
- host: {{ .host | quote }}
http:
paths:
......@@ -66,4 +69,29 @@ spec:
name: {{ $fullName }}-client
port:
number: 80
{{- else -}}
- host: {{ .host | quote }}
http:
paths:
- path: /(ows.*)
backend:
serviceName: {{ $fullName }}-renderer
servicePort: http
- path: /(opensearch.*)
backend:
serviceName: {{ $fullName }}-renderer
servicePort: http
- path: /(admin.*)
backend:
serviceName: {{ $fullName }}-renderer
servicePort: http
- path: /cache/(.*)
backend:
serviceName: {{ $fullName }}-cache
servicePort: http
- path: /(.*)
backend:
serviceName: {{ $fullName }}-client
servicePort: http
{{- end -}}
{{- end }}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment