Global & specific values

nemerosa · Sep 30, 2024 · f30855e · f30855e
1 parent 331513f
commit f30855e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/apps/application.yaml b/apps/application.yaml
@@ -12,14 +12,13 @@ spec:
     helm:
       releaseName: "umbrella"
       values: |
-        backend:
+        global:
           common:
-            version: "1.2"
+            version: "1.0"
+        backend:
           image:
-            tag: "1.22"
+            tag: "1.20"
         frontend:
-          common:
-            version: "1.2"
           image:
             tag: "1.22"
   destination:

diff --git a/charts/backend/Chart.yaml b/charts/backend/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: backend
 description: A Helm chart for testing purposes
 type: application
-version: "1.1.0"
+version: "1.2.0"
 appVersion: "1.0"
diff --git a/charts/backend/templates/configmap.yaml b/charts/backend/templates/configmap.yaml
@@ -3,4 +3,4 @@ kind: ConfigMap
 metadata:
   name: backend-cm
 data:
-  COMMON_VERSION: "{{ .Values.common.version }}"
+  COMMON_VERSION: {{ .Values.common.version | default .Values.global.common.version | quote }}
diff --git a/charts/backend/values.yaml b/charts/backend/values.yaml
@@ -1,3 +1,6 @@
+global:
+  common:
+    version: 0.0
 common:
   version: 0.0
 image:

diff --git a/charts/frontend/Chart.yaml b/charts/frontend/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: frontend
 description: A Helm chart for testing purposes
 type: application
-version: "1.1.0"
+version: "1.2.0"
 appVersion: "1.0"
diff --git a/charts/frontend/templates/configmap.yaml b/charts/frontend/templates/configmap.yaml
@@ -3,4 +3,4 @@ kind: ConfigMap
 metadata:
   name: frontend-cm
 data:
-  COMMON_VERSION: "{{ .Values.common.version }}"
+  COMMON_VERSION: {{ .Values.common.version | default .Values.global.common.version | quote }}
diff --git a/charts/frontend/values.yaml b/charts/frontend/values.yaml
@@ -1,3 +1,6 @@
+global:
+  common:
+    version: 0.0
 common:
   version: 0.0
 image: