Merge pull request #107 from mhjacks/main

Add sharedValueFiles to all clusterGroup files in lieu of "magic" value files

Author: mhjacks

values-AWS-4.10.yaml overrides/values-AWS-4.10.yamlvalues-AWS-4.10.yaml renamed to overrides/values-AWS-4.10.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

values-AWS-4.12.yaml overrides/values-AWS-4.12.yamlvalues-AWS-4.12.yaml renamed to overrides/values-AWS-4.12.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

values-AWS.yaml overrides/values-AWS.yamlvalues-AWS.yaml renamed to overrides/values-AWS.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