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 ...@@ -7,7 +7,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # 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. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # 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 # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
......
{{- $fullName := include "vs.fullname" . -}} {{- $fullName := include "vs.fullname" . -}}
{{- $svcPort := .Values.service.port -}} {{- $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 apiVersion: networking.k8s.io/v1
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta
{{- else -}} {{- else -}}
apiVersion: extensions/v1 apiVersion: extensions/v1
{{- end }} {{- end }}
...@@ -30,68 +28,68 @@ spec: ...@@ -30,68 +28,68 @@ spec:
{{- end }} {{- end }}
rules: rules:
{{- range .Values.ingress.hosts }} {{- range .Values.ingress.hosts }}
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
- host: {{ .host | quote }} - host: {{ .host | quote }}
http: http:
paths: paths:
- path: /(ows.*) - path: /(ows.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: {{ $fullName }}-renderer name: {{ $fullName }}-renderer
port: port:
number: 80 number: 80
- path: /(opensearch.*) - path: /(opensearch.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: {{ $fullName }}-renderer name: {{ $fullName }}-renderer
port: port:
number: 80 number: 80
- path: /(admin.*) - path: /(admin.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: {{ $fullName }}-renderer name: {{ $fullName }}-renderer
port: port:
number: 80 number: 80
- path: /cache/(.*) - path: /cache/(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: {{ $fullName }}-cache name: {{ $fullName }}-cache
port: port:
number: 80 number: 80
- path: /(.*) - path: /(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: {{ $fullName }}-client name: {{ $fullName }}-client
port: port:
number: 80 number: 80
{{- else }} {{- else }}
- host: {{ .host | quote }} - host: {{ .host | quote }}
http: http:
paths: paths:
- path: /(ows.*) - path: /(ows.*)
backend: backend:
serviceName: {{ $fullName }}-renderer serviceName: {{ $fullName }}-renderer
servicePort: http servicePort: http
- path: /(opensearch.*) - path: /(opensearch.*)
backend: backend:
serviceName: {{ $fullName }}-renderer serviceName: {{ $fullName }}-renderer
servicePort: http servicePort: http
- path: /(admin.*) - path: /(admin.*)
backend: backend:
serviceName: {{ $fullName }}-renderer serviceName: {{ $fullName }}-renderer
servicePort: http servicePort: http
- path: /cache/(.*) - path: /cache/(.*)
backend: backend:
serviceName: {{ $fullName }}-cache serviceName: {{ $fullName }}-cache
servicePort: http servicePort: http
- path: /(.*) - path: /(.*)
backend: backend:
serviceName: {{ $fullName }}-client serviceName: {{ $fullName }}-client
servicePort: http servicePort: http
{{- end -}} {{- end -}}
{{- 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