diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 08219b0c5f74b1408b822bb1a57cc5b951719b74..6bc53296b68439acbf68ebf2b8e84d7cc4b398f2 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -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. diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml index d4023f60a8a1223dcb545f7c88998292a6c81488..86544169a43f3c736e5a872ed6a82f0b1477e577 100644 --- a/chart/templates/ingress.yaml +++ b/chart/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- $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 }}