EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit c6a9a5b9 authored by Fabian Schindler's avatar Fabian Schindler
Browse files

Trying to fix networking issue

parent 667c8b73
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.23
version: 0.3.24
# 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.19-0" .Capabilities.KubeVersion.GitVersion -}}
{{- if semverCompare ">=1.18-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 }}
......@@ -30,68 +28,68 @@ spec:
{{- end }}
rules:
{{- range .Values.ingress.hosts }}
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
{{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
- host: {{ .host | quote }}
http:
paths:
- path: /(ows.*)
pathType: Prefix
backend:
service:
service:
name: {{ $fullName }}-renderer
port:
port:
number: 80
- path: /(opensearch.*)
pathType: Prefix
backend:
service:
service:
name: {{ $fullName }}-renderer
port:
port:
number: 80
- path: /(admin.*)
pathType: Prefix
backend:
service:
service:
name: {{ $fullName }}-renderer
port:
port:
number: 80
- path: /cache/(.*)
pathType: Prefix
backend:
service:
service:
name: {{ $fullName }}-cache
port:
port:
number: 80
- path: /(.*)
pathType: Prefix
backend:
service:
service:
name: {{ $fullName }}-client
port:
number: 80
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
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