Merge pull request #83 from dasmeta/DMVP-3074

fix(DMVP-3074): Fix merge logic
dasmeta · Nov 14, 2023 · 9751eea · 9751eea
2 parents 6545e38 + 27a7c94
commit 9751eea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/charts/base/Chart.yaml b/charts/base/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.51
+version: 0.1.52
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.51"
+appVersion: "0.1.52"
diff --git a/charts/base/templates/_helpers.tpl b/charts/base/templates/_helpers.tpl
@@ -85,7 +85,7 @@ Return the target/server Kubernetes version
                     "alb.ingress.kubernetes.io/healthcheck-path" "/"
                     "alb.ingress.kubernetes.io/listen-ports" "[{\"HTTP\":80},{\"HTTPS\":443}]"
                     "alb.ingress.kubernetes.io/success-codes" "200-399" -}}
-{{- $mergedAnnotations := merge $defaultAnnotations $ingressAnnotations -}}
+{{- $mergedAnnotations := merge $ingressAnnotations $defaultAnnotations -}}
 {{- $mergedAnnotations | toYaml }}
 {{- else if eq .Values.ingress.class "application-gateway" }}
 {{- $defaultAnnotations := dict "kubernetes.io/ingress.class" "azure/application-gateway"
@@ -97,11 +97,11 @@ Return the target/server Kubernetes version
 {{- else if eq .Values.ingress.class "cce" }}
 {{- $defaultAnnotations := dict "kubernetes.io/ingress.class" "cce"
                     "kubernetes.io/elb.port" "443" -}}
-{{- $mergedAnnotations := merge $defaultAnnotations $ingressAnnotations -}}
+{{- $mergedAnnotations := merge $ingressAnnotations $defaultAnnotations -}}
 {{- $mergedAnnotations | toYaml }}
 {{- else if eq .Values.ingress.class "nginx" }}
 {{- $defaultAnnotations := dict "kubernetes.io/ingress.class" "nginx" -}}
-{{- $mergedAnnotations := merge $defaultAnnotations $ingressAnnotations -}}
+{{- $mergedAnnotations := merge $ingressAnnotations $defaultAnnotations -}}
 {{- $mergedAnnotations | toYaml }}
 {{- end }}
 {{- end }}