Merge pull request #107 from mhjacks/main

Add sharedValueFiles to all clusterGroup files in lieu of "magic" value files
validatedpatterns · Oct 23, 2023 · 7a66342 · 7a66342
2 parents a0e169d + 28031ca
commit 7a66342
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 3 deletions.
diff --git a/values-AWS-4.10.yaml → overrides/values-AWS-4.10.yaml b/values-AWS-4.10.yaml → overrides/values-AWS-4.10.yaml
diff --git a/values-AWS-4.12.yaml → overrides/values-AWS-4.12.yaml b/values-AWS-4.12.yaml → overrides/values-AWS-4.12.yaml
diff --git a/values-AWS.yaml → overrides/values-AWS.yaml b/values-AWS.yaml → overrides/values-AWS.yaml
diff --git a/values-Azure-4.10.yaml → overrides/values-Azure-4.10.yaml b/values-Azure-4.10.yaml → overrides/values-Azure-4.10.yaml
diff --git a/values-Azure.yaml → overrides/values-Azure.yaml b/values-Azure.yaml → overrides/values-Azure.yaml
diff --git a/values-GCP-4.10.yaml → overrides/values-GCP-4.10.yaml b/values-GCP-4.10.yaml → overrides/values-GCP-4.10.yaml
diff --git a/values-GCP.yaml → overrides/values-GCP.yaml b/values-GCP.yaml → overrides/values-GCP.yaml
diff --git a/values-all-in-one.yaml b/values-all-in-one.yaml
@@ -95,7 +95,11 @@ clusterGroup:
   #Adding jchraibi #advanced-devsecops to pattern framework
   - spring-petclinic
   - rollouts
-
+
+  sharedValueFiles:
+    - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
+    - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml'
+
   applications:
     acm:
       name: acm   #arbitary

diff --git a/values-development.yaml b/values-development.yaml
@@ -56,6 +56,10 @@ clusterGroup:
     - spring-petclinic
     - rollouts
 
+  sharedValueFiles:
+    - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
+    - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' #   E:
+
   applications:
     acs-secured:
       name: acs-secured
@@ -135,7 +139,7 @@ clusterGroup:
 #      project: spring-petclinic
 #      path: charts/region/stage/spring-petclinic-config
 
-    
+
     dev-spring-petclinic:
       name: dev-spring-petclinic
       namespace: devsecops-dev

diff --git a/values-hub.yaml b/values-hub.yaml
@@ -48,7 +48,11 @@ clusterGroup:
   - hub
   - opp
   - external-secrets
-
+
+  sharedValueFiles:
+    - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
+    - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' #   E: line too long (115 > 80 characters)
+
   applications:
     acm:
       name: acm   #arbitary

diff --git a/values-opphub.yaml b/values-opphub.yaml
@@ -48,6 +48,10 @@ clusterGroup:
   - opp
   - golang-external-secrets
 
+  sharedValueFiles:
+    - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
+    - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' #   E:
+
   applications:
     acm:
       name: acm   #arbitary

diff --git a/values-production.yaml b/values-production.yaml
@@ -27,6 +27,10 @@ clusterGroup:
     - app
     - secured
 
+  sharedValueFiles:
+    - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
+    - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' #   E:
+
   applications:
     acs-secured:
       name: acs-secured