[devxp-app] ⚡ Add helper for virtual-service

devxp-tech · Jun 17, 2024 · 23dfe9f · 23dfe9f
1 parent 85b806c
commit 23dfe9f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/charts/devxp-app/templates/_helpers.tpl b/charts/devxp-app/templates/_helpers.tpl
@@ -110,18 +110,6 @@ kind: Deployment
 {{- end  }}
 
 
-{{- define "vs-hosts" }}
-{{- $hosts := list }}
-{{- $name := .Values.name }}
-{{- $hosts = append $hosts (printf "%s.%s" $name .Values.global.network.domain) }}
-{{- if .Values.istio.virtualServices.custom.hosts }}
-  {{- range $_, $host:= .Values.istio.virtualServices.custom.hosts }}
-  {{- $hosts = append $hosts ($host) }}
-  {{- end }}
-{{- end }}
-{{- $hosts | toYaml }}
-{{- end }}
-
 
 
 
diff --git a/charts/devxp-app/templates/istio/_virtual-service.tpl b/charts/devxp-app/templates/istio/_virtual-service.tpl
@@ -0,0 +1,12 @@
+{{- define "vs-hosts" }}
+{{- $hosts := list }}
+{{- $name := .Values.name }}
+{{- $hosts = append $hosts (printf "%s.%s" $name .Values.global.network.domain) }}
+{{- if .Values.istio.virtualServices.custom.hosts }}
+  {{- range $_, $host := .Values.istio.virtualServices.custom.hosts }}
+  {{- $hosts = append $hosts $host }}
+  {{- end }}
+{{- end }}
+{{- $hosts | toYaml | nindent 2 }}
+{{- end }}
+
diff --git a/charts/devxp-app/templates/istio/virtual-service.yaml b/charts/devxp-app/templates/istio/virtual-service.yaml
@@ -15,7 +15,7 @@ spec:
   gateways:
   - {{ .Values.istio.gateways }}
   hosts:
-  {{- include "vs-hosts" . | nindent 2 }}
+  {{- include "vs-hosts" . | indent 2 }}
   http:
   {{- if .Values.argoRollouts.enabled }}
   - name: primary

diff --git a/charts/devxp-app/values-ci.yaml b/charts/devxp-app/values-ci.yaml
@@ -10,4 +10,4 @@ monitoring:
     extraPort:
       enabled: true
 actuator:
-  enabled: false
+  enabled: false