EOX GitLab Instance

Commit afe71f96 authored by Nikola Jankovic's avatar Nikola Jankovic 💻
Browse files

defaulting to global ingress if local not set

parent a4b98409
Pipeline #19006 passed with stage
in 3 minutes and 14 seconds
...@@ -10,15 +10,15 @@ metadata: ...@@ -10,15 +10,15 @@ metadata:
name: {{ $fullName }} name: {{ $fullName }}
labels: labels:
{{- include "vs-client.labels" . | nindent 4 }} {{- include "vs-client.labels" . | nindent 4 }}
{{- with .Values.global.ingress.annotations }} {{- with .Values.ingress.annotations | default .Values.global.ingress.annotations }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
nginx.ingress.kubernetes.io/rewrite-target: /$1 nginx.ingress.kubernetes.io/rewrite-target: /$1
{{- end }} {{- end }}
spec: spec:
{{- if .Values.global.ingress.tls }} {{- if .Values.ingress.tls | default .Values.global.ingress.tls }}
tls: tls:
{{- range .Values.global.ingress.tls }} {{- range .Values.ingress.tls | default .Values.global.ingress.tls }}
- hosts: - hosts:
{{- range .hosts }} {{- range .hosts }}
- {{ . | quote }} - {{ . | quote }}
...@@ -27,7 +27,7 @@ spec: ...@@ -27,7 +27,7 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
rules: rules:
{{- range .Values.global.ingress.hosts }} {{- range .Values.ingress.hosts | default .Values.global.ingress.hosts }}
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
- host: {{ .host | quote }} - host: {{ .host | quote }}
http: http:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment