Add sharedValueFiles to all clusterGroup files

Author: Martin Jackson

values-all-in-one.yaml

@@ -32,10 +32,6 @@ clusterGroup:
   name: hub
   isHubCluster: true
 
-  sharedValueFiles:
-    - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
-    - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml'
-
 # Namespaces that are expected to be created.
 # The pattern will apply these namespaces
 # and creates an operator group for that namespace
@@ -252,6 +248,10 @@ clusterGroup:
       # timeout: 234
       # verbosity: "-v"
 
+  sharedValueFiles:
+    - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
+    - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml'
+
 # This section is used by ACM
   managedClusterGroups:
   - name: development

values-development.yaml

@@ -135,14 +135,18 @@ clusterGroup:
 #      project: spring-petclinic
 #      path: charts/region/stage/spring-petclinic-config
 
-    
+
     dev-spring-petclinic:
       name: dev-spring-petclinic
       namespace: devsecops-dev
       project: spring-petclinic
       kustomize: true
       path: charts/region/spring-petclinic/environments/dev
 
+  sharedValueFiles:
+    - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
+E   - '/cluster-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

@@ -135,6 +135,10 @@ clusterGroup:
       # timeout: 234
       # verbosity: "-v"
 
+  sharedValueFiles:
+    - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
+E   - '/cluster-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

@@ -105,6 +105,9 @@ clusterGroup:
       project: hub
       path: charts/hub/cli-tools
 
+  sharedValueFiles:
+    - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
+E   - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' #   E:
 # This section is used by ACM
   managedClusterGroups:
   - name: devel

values-production.yaml

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