From 36ba6507e3c3e5509c672356f2942c72b46850d4 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Wed, 12 Apr 2023 22:19:54 +0100
Subject: [PATCH] Syntax fix for proxy service image in helm charts (#10284)

---
 charts/budibase/templates/app-service-deployment.yaml    | 7 +------
 charts/budibase/templates/proxy-service-deployment.yaml  | 7 +------
 charts/budibase/templates/worker-service-deployment.yaml | 7 +------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index a540204843..2b2589406a 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -199,12 +199,7 @@ spec:
           value: {{ .Values.services.tlsRejectUnauthorized }}
         {{ end }}
 
-        image: >-
-          {{- if .Values.globals.appVersion }}
-          budibase/apps:{{ .Values.globals.appVersion }}
-          {{- else }}
-          budibase/apps:{{ .Chart.AppVersion }}
-          {{- end }}
+        image: budibase/apps:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
diff --git a/charts/budibase/templates/proxy-service-deployment.yaml b/charts/budibase/templates/proxy-service-deployment.yaml
index 2eec4123ef..e4825ea5d0 100644
--- a/charts/budibase/templates/proxy-service-deployment.yaml
+++ b/charts/budibase/templates/proxy-service-deployment.yaml
@@ -37,12 +37,7 @@ spec:
 {{ end }}
     spec:
       containers:
-        image: >-
-          {{- if .Values.globals.appVersion }}
-          budibase/proxy:{{ .Values.globals.appVersion }}
-          {{- else }}
-          budibase/proxy:{{ .Chart.AppVersion }}
-          {{- end }}
+      - image: budibase/proxy:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
         imagePullPolicy: Always
         name: proxy-service
         ports:
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index b65274a0d3..5fed80b355 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -188,12 +188,7 @@ spec:
         - name: NODE_TLS_REJECT_UNAUTHORIZED
           value: {{ .Values.services.tlsRejectUnauthorized }}
         {{ end }}
-        image: >-
-          {{- if .Values.globals.appVersion }}
-          budibase/worker:{{ .Values.globals.appVersion }}
-          {{- else }}
-          budibase/worker:{{ .Chart.AppVersion }}
-          {{- end }}
+        image: budibase/worker:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
         imagePullPolicy: Always
         livenessProbe:
           httpGet: