Skip to content

Commit

Permalink
chore(app): ensure most specific wins
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
stevepentland committed Aug 20, 2024
1 parent d16e27c commit 1f5eb86
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion charts/nx-cloud/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
4 changes: 2 additions & 2 deletions charts/nx-cloud/templates/_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down

0 comments on commit 1f5eb86

Please sign in to comment.