From 1f5eb864ca53933f6529598cbb6821a43b377b22 Mon Sep 17 00:00:00 2001
From: Steve Pentland <steve@nrwl.io>
Date: Tue, 20 Aug 2024 15:47:49 -0400
Subject: [PATCH] chore(app): ensure most specific wins

I found that when trying to override a single image for the messagequeue
the global values continued to clobber mine as they are the last value
in the default clause. This moves the specific values to the end of the
default params to ensure if you have a more specific value it will
not be overridden by global values.
---
 charts/nx-cloud/Chart.yaml            | 2 +-
 charts/nx-cloud/templates/_images.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/nx-cloud/Chart.yaml b/charts/nx-cloud/Chart.yaml
index 222f979..833cebf 100644
--- a/charts/nx-cloud/Chart.yaml
+++ b/charts/nx-cloud/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: nx-cloud
 description: Nx Cloud Helm Chart
 type: application
-version: 0.15.7
+version: 0.15.8
 maintainers:
   - name: nx
     url: "https://nx.app/"
diff --git a/charts/nx-cloud/templates/_images.yml b/charts/nx-cloud/templates/_images.yml
index c8493d2..b7b60e5 100644
--- a/charts/nx-cloud/templates/_images.yml
+++ b/charts/nx-cloud/templates/_images.yml
@@ -6,13 +6,13 @@ and modified to support global imageTag
 */}}
 {{- define "nxCloud.images.common" }}
 {{- $registryName := .imageRoot.registry }}
-{{- $repositoryName := default .imageRoot.repository .global.imageRepository }}
+{{- $repositoryName := default .global.imageRepository .imageRoot.repository }}
 {{- $imageName := .imageRoot.imageName }}
 {{- $separator := ":" }}
 {{- $termination := default .image.tag (default .global.imageTag .imageRoot.tag) | toString }}
 {{- if .global }}
     {{- if .global.imageRegistry }}
-     {{- $registryName = .global.imageRegistry }}
+     {{- $registryName = default .global.imageRegistry $registryName }}
     {{- end }}
 {{- end }}
 {{- if .imageRoot.digest }}