Move sharedValueFiles declaration by common consent

Author: Martin Jackson

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
@@ -248,10 +252,6 @@ clusterGroup:
       # timeout: 234
       # verbosity: "-v"
 
-  sharedValueFiles:
-    - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
-    - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml'
-
 # This section is used by ACM
   managedClusterGroups:
   - name: development

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
@@ -143,10 +147,6 @@ clusterGroup:
       kustomize: true
       path: charts/region/spring-petclinic/environments/dev
 
-  sharedValueFiles:
-    - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
-    - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' #   E:
-
 #  To have apps in multiple flavors, use namespaces and use helm overrides as appropriate
 #
 #  - name: pipelines

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
@@ -135,10 +139,6 @@ clusterGroup:
       # timeout: 234
       # verbosity: "-v"
 
-  sharedValueFiles:
-    - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
-    - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' #   E: line too long (115 > 80 characters)
-
 # This section is used by ACM
   managedClusterGroups:
   - name: development

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
@@ -105,10 +109,6 @@ clusterGroup:
       project: hub
       path: charts/hub/cli-tools
 
-  sharedValueFiles:
-    - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
-    - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' #   E:
-
 # This section is used by ACM
   managedClusterGroups:
   - name: devel

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
@@ -39,7 +43,3 @@ clusterGroup:
       namespace: openshift-operators
       project: secured
       path: charts/region/quay
-
-  sharedValueFiles:
-    - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
-    - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' #   E: