Update helpers functions in subcharts (#18757)

* Update helpers functions in subcharts; Refactor component.imageTag function call * fix typo in _helpers.tpl
airbytehq · Nov 1, 2022 · 04d84ce · 04d84ce
1 parent 5ce7ffd
commit 04d84ce
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/charts/airbyte-bootloader/templates/_helpers.tpl b/charts/airbyte-bootloader/templates/_helpers.tpl
@@ -75,10 +75,10 @@ Define imageTag
 */}}
 
 {{- define "bootloader.imageTag" -}}
-{{- if ((.Values.global.image).tag) }}
-    {{- printf "%s" .Values.global.image.tag }}
-{{- else if .Values.image.tag }}
+{{- if .Values.image.tag }}
     {{- printf "%s" .Values.image.tag }}
+{{- else if ((.Values.global.image).tag) }}
+    {{- printf "%s" .Values.global.image.tag }}
 {{- else }}
     {{- printf "%s" .Chart.AppVersion }}
 {{- end }}

diff --git a/charts/airbyte-cron/templates/_helpers.tpl b/charts/airbyte-cron/templates/_helpers.tpl
@@ -63,10 +63,10 @@ Define imageTag
 */}}
 
 {{- define "cron.imageTag" -}}
-{{- if ((.Values.global.image).tag) }}
-    {{- printf "%s" .Values.global.image.tag }}
-{{- else if .Values.image.tag }}
+{{- if .Values.image.tag }}
     {{- printf "%s" .Values.image.tag }}
+{{- else if ((.Values.global.image).tag) }}
+    {{- printf "%s" .Values.global.image.tag }}
 {{- else }}
     {{- printf "%s" .Chart.AppVersion }}
 {{- end }}

diff --git a/charts/airbyte-metrics/templates/_helpers.tpl b/charts/airbyte-metrics/templates/_helpers.tpl
@@ -43,10 +43,10 @@ Define imageTag
 */}}
 
 {{- define "metrics.imageTag" -}}
-{{- if ((.Values.global.image).tag) }}
-    {{- printf "%s" .Values.global.image.tag }}
-{{- else if .Values.image.tag }}
+{{- if .Values.image.tag }}
     {{- printf "%s" .Values.image.tag }}
+{{- else if ((.Values.global.image).tag) }}
+    {{- printf "%s" .Values.global.image.tag }}
 {{- else }}
     {{- printf "%s" .Chart.AppVersion }}
 {{- end }}

diff --git a/charts/airbyte-server/templates/_helpers.tpl b/charts/airbyte-server/templates/_helpers.tpl
@@ -63,10 +63,10 @@ Define imageTag
 */}}
 
 {{- define "server.imageTag" -}}
-{{- if ((.Values.global.image).tag) }}
-    {{- printf "%s" .Values.global.image.tag }}
-{{- else if .Values.image.tag }}
+{{- if .Values.image.tag }}
     {{- printf "%s" .Values.image.tag }}
+{{- else if ((.Values.global.image).tag) }}
+    {{- printf "%s" .Values.global.image.tag }}
 {{- else }}
     {{- printf "%s" .Chart.AppVersion }}
 {{- end }}

diff --git a/charts/airbyte-webapp/templates/_helpers.tpl b/charts/airbyte-webapp/templates/_helpers.tpl
@@ -64,10 +64,10 @@ Define imageTag
 */}}
 
 {{- define "webapp.imageTag" -}}
-{{- if ((.Values.global.image).tag) }}
-    {{- printf "%s" .Values.global.image.tag }}
-{{- else if .Values.image.tag }}
+{{- if .Values.image.tag }}
     {{- printf "%s" .Values.image.tag }}
+{{- else if ((.Values.global.image).tag) }}
+    {{- printf "%s" .Values.global.image.tag }}
 {{- else }}
     {{- printf "%s" .Chart.AppVersion }}
 {{- end }}

diff --git a/charts/airbyte-worker/templates/_helpers.tpl b/charts/airbyte-worker/templates/_helpers.tpl
@@ -63,10 +63,10 @@ Define imageTag
 */}}
 
 {{- define "worker.imageTag" -}}
-{{- if ((.Values.global.image).tag) }}
-    {{- printf "%s" .Values.global.image.tag }}
-{{- else if .Values.image.tag }}
+{{- if .Values.image.tag }}
     {{- printf "%s" .Values.image.tag }}
+{{- else if ((.Values.global.image).tag) }}
+    {{- printf "%s" .Values.global.image.tag }}
 {{- else }}
     {{- printf "%s" .Chart.AppVersion }}
 {{- end }}