From ab96e0d311a2da56c91906a3e7e9bf41f17fbcde Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Tue, 17 Oct 2023 16:39:54 -0500 Subject: [PATCH 1/5] Add cluster overrides --- .../values-AWS-4.10.yaml | 0 .../values-AWS-4.12.yaml | 0 values-AWS.yaml => cluster-overrides/values-AWS.yaml | 0 .../values-Azure-4.10.yaml | 0 values-Azure.yaml => cluster-overrides/values-Azure.yaml | 0 .../values-GCP-4.10.yaml | 0 values-GCP.yaml => cluster-overrides/values-GCP.yaml | 0 values-all-in-one.yaml | 4 ++++ 8 files changed, 4 insertions(+) rename values-AWS-4.10.yaml => cluster-overrides/values-AWS-4.10.yaml (100%) rename values-AWS-4.12.yaml => cluster-overrides/values-AWS-4.12.yaml (100%) rename values-AWS.yaml => cluster-overrides/values-AWS.yaml (100%) rename values-Azure-4.10.yaml => cluster-overrides/values-Azure-4.10.yaml (100%) rename values-Azure.yaml => cluster-overrides/values-Azure.yaml (100%) rename values-GCP-4.10.yaml => cluster-overrides/values-GCP-4.10.yaml (100%) rename values-GCP.yaml => cluster-overrides/values-GCP.yaml (100%) diff --git a/values-AWS-4.10.yaml b/cluster-overrides/values-AWS-4.10.yaml similarity index 100% rename from values-AWS-4.10.yaml rename to cluster-overrides/values-AWS-4.10.yaml diff --git a/values-AWS-4.12.yaml b/cluster-overrides/values-AWS-4.12.yaml similarity index 100% rename from values-AWS-4.12.yaml rename to cluster-overrides/values-AWS-4.12.yaml diff --git a/values-AWS.yaml b/cluster-overrides/values-AWS.yaml similarity index 100% rename from values-AWS.yaml rename to cluster-overrides/values-AWS.yaml diff --git a/values-Azure-4.10.yaml b/cluster-overrides/values-Azure-4.10.yaml similarity index 100% rename from values-Azure-4.10.yaml rename to cluster-overrides/values-Azure-4.10.yaml diff --git a/values-Azure.yaml b/cluster-overrides/values-Azure.yaml similarity index 100% rename from values-Azure.yaml rename to cluster-overrides/values-Azure.yaml diff --git a/values-GCP-4.10.yaml b/cluster-overrides/values-GCP-4.10.yaml similarity index 100% rename from values-GCP-4.10.yaml rename to cluster-overrides/values-GCP-4.10.yaml diff --git a/values-GCP.yaml b/cluster-overrides/values-GCP.yaml similarity index 100% rename from values-GCP.yaml rename to cluster-overrides/values-GCP.yaml diff --git a/values-all-in-one.yaml b/values-all-in-one.yaml index 718ef886..1ce48e26 100644 --- a/values-all-in-one.yaml +++ b/values-all-in-one.yaml @@ -32,6 +32,10 @@ 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 From 8feb8c86f03137492972e0937c4b2bee0b43e38d Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Tue, 17 Oct 2023 16:55:28 -0500 Subject: [PATCH 2/5] Add sharedValueFiles to all clusterGroup files --- values-all-in-one.yaml | 8 ++++---- values-development.yaml | 6 +++++- values-hub.yaml | 4 ++++ values-opphub.yaml | 3 +++ values-production.yaml | 4 ++++ 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/values-all-in-one.yaml b/values-all-in-one.yaml index 1ce48e26..bc5541af 100644 --- a/values-all-in-one.yaml +++ b/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 diff --git a/values-development.yaml b/values-development.yaml index 77c25ab7..8623afac 100644 --- a/values-development.yaml +++ b/values-development.yaml @@ -135,7 +135,7 @@ clusterGroup: # project: spring-petclinic # path: charts/region/stage/spring-petclinic-config - + dev-spring-petclinic: name: dev-spring-petclinic namespace: devsecops-dev @@ -143,6 +143,10 @@ clusterGroup: 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 diff --git a/values-hub.yaml b/values-hub.yaml index d3049ec2..16cab8f8 100644 --- a/values-hub.yaml +++ b/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 diff --git a/values-opphub.yaml b/values-opphub.yaml index be2afb25..c4697478 100644 --- a/values-opphub.yaml +++ b/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 diff --git a/values-production.yaml b/values-production.yaml index 92693d91..946021ae 100644 --- a/values-production.yaml +++ b/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: From 2e8f6ead480cfab9a19f99cd8dd0d07de4a38412 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Wed, 18 Oct 2023 08:15:17 -0500 Subject: [PATCH 3/5] Clean up spacing and stray error markers --- values-development.yaml | 2 +- values-hub.yaml | 2 +- values-opphub.yaml | 3 ++- values-production.yaml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/values-development.yaml b/values-development.yaml index 8623afac..24dd21bb 100644 --- a/values-development.yaml +++ b/values-development.yaml @@ -145,7 +145,7 @@ clusterGroup: sharedValueFiles: - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml' -E - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.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 # diff --git a/values-hub.yaml b/values-hub.yaml index 16cab8f8..6540659b 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -137,7 +137,7 @@ clusterGroup: 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) + - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # E: line too long (115 > 80 characters) # This section is used by ACM managedClusterGroups: diff --git a/values-opphub.yaml b/values-opphub.yaml index c4697478..dc77cc71 100644 --- a/values-opphub.yaml +++ b/values-opphub.yaml @@ -107,7 +107,8 @@ clusterGroup: sharedValueFiles: - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml' -E - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # E: + - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # E: + # This section is used by ACM managedClusterGroups: - name: devel diff --git a/values-production.yaml b/values-production.yaml index 946021ae..a59a7f0d 100644 --- a/values-production.yaml +++ b/values-production.yaml @@ -42,4 +42,4 @@ clusterGroup: sharedValueFiles: - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml' -E - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # E: + - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # E: From f1732901aabce1a4bf5f28d45c5f6294c14b51fe Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Wed, 18 Oct 2023 13:35:13 -0500 Subject: [PATCH 4/5] Update overrides directory and references --- {cluster-overrides => overrides}/values-AWS-4.10.yaml | 0 {cluster-overrides => overrides}/values-AWS-4.12.yaml | 0 {cluster-overrides => overrides}/values-AWS.yaml | 0 {cluster-overrides => overrides}/values-Azure-4.10.yaml | 0 {cluster-overrides => overrides}/values-Azure.yaml | 0 {cluster-overrides => overrides}/values-GCP-4.10.yaml | 0 {cluster-overrides => overrides}/values-GCP.yaml | 0 values-all-in-one.yaml | 4 ++-- values-development.yaml | 4 ++-- values-hub.yaml | 4 ++-- values-opphub.yaml | 4 ++-- values-production.yaml | 4 ++-- 12 files changed, 10 insertions(+), 10 deletions(-) rename {cluster-overrides => overrides}/values-AWS-4.10.yaml (100%) rename {cluster-overrides => overrides}/values-AWS-4.12.yaml (100%) rename {cluster-overrides => overrides}/values-AWS.yaml (100%) rename {cluster-overrides => overrides}/values-Azure-4.10.yaml (100%) rename {cluster-overrides => overrides}/values-Azure.yaml (100%) rename {cluster-overrides => overrides}/values-GCP-4.10.yaml (100%) rename {cluster-overrides => overrides}/values-GCP.yaml (100%) diff --git a/cluster-overrides/values-AWS-4.10.yaml b/overrides/values-AWS-4.10.yaml similarity index 100% rename from cluster-overrides/values-AWS-4.10.yaml rename to overrides/values-AWS-4.10.yaml diff --git a/cluster-overrides/values-AWS-4.12.yaml b/overrides/values-AWS-4.12.yaml similarity index 100% rename from cluster-overrides/values-AWS-4.12.yaml rename to overrides/values-AWS-4.12.yaml diff --git a/cluster-overrides/values-AWS.yaml b/overrides/values-AWS.yaml similarity index 100% rename from cluster-overrides/values-AWS.yaml rename to overrides/values-AWS.yaml diff --git a/cluster-overrides/values-Azure-4.10.yaml b/overrides/values-Azure-4.10.yaml similarity index 100% rename from cluster-overrides/values-Azure-4.10.yaml rename to overrides/values-Azure-4.10.yaml diff --git a/cluster-overrides/values-Azure.yaml b/overrides/values-Azure.yaml similarity index 100% rename from cluster-overrides/values-Azure.yaml rename to overrides/values-Azure.yaml diff --git a/cluster-overrides/values-GCP-4.10.yaml b/overrides/values-GCP-4.10.yaml similarity index 100% rename from cluster-overrides/values-GCP-4.10.yaml rename to overrides/values-GCP-4.10.yaml diff --git a/cluster-overrides/values-GCP.yaml b/overrides/values-GCP.yaml similarity index 100% rename from cluster-overrides/values-GCP.yaml rename to overrides/values-GCP.yaml diff --git a/values-all-in-one.yaml b/values-all-in-one.yaml index bc5541af..3bb5017c 100644 --- a/values-all-in-one.yaml +++ b/values-all-in-one.yaml @@ -249,8 +249,8 @@ clusterGroup: # verbosity: "-v" sharedValueFiles: - - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml' - - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' + - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml' + - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # This section is used by ACM managedClusterGroups: diff --git a/values-development.yaml b/values-development.yaml index 24dd21bb..faa61a16 100644 --- a/values-development.yaml +++ b/values-development.yaml @@ -144,8 +144,8 @@ clusterGroup: path: charts/region/spring-petclinic/environments/dev sharedValueFiles: - - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml' - - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # E: + - '/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 # diff --git a/values-hub.yaml b/values-hub.yaml index 6540659b..01ea2477 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -136,8 +136,8 @@ clusterGroup: # verbosity: "-v" sharedValueFiles: - - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml' - - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # E: line too long (115 > 80 characters) + - '/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: diff --git a/values-opphub.yaml b/values-opphub.yaml index dc77cc71..255142e2 100644 --- a/values-opphub.yaml +++ b/values-opphub.yaml @@ -106,8 +106,8 @@ clusterGroup: path: charts/hub/cli-tools sharedValueFiles: - - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml' - - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # E: + - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml' + - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # E: # This section is used by ACM managedClusterGroups: diff --git a/values-production.yaml b/values-production.yaml index a59a7f0d..3767ebd9 100644 --- a/values-production.yaml +++ b/values-production.yaml @@ -41,5 +41,5 @@ clusterGroup: path: charts/region/quay sharedValueFiles: - - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}.yaml' - - '/cluster-overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # E: + - '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml' + - '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # E: From 28031ca39654db268368745e81a0f01673845b33 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Mon, 23 Oct 2023 16:03:43 -0500 Subject: [PATCH 5/5] Move sharedValueFiles declaration by common consent --- values-all-in-one.yaml | 10 +++++----- values-development.yaml | 8 ++++---- values-hub.yaml | 10 +++++----- values-opphub.yaml | 8 ++++---- values-production.yaml | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/values-all-in-one.yaml b/values-all-in-one.yaml index 3bb5017c..f83d7d0f 100644 --- 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 @@ -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 diff --git a/values-development.yaml b/values-development.yaml index faa61a16..286be94c 100644 --- 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 @@ -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 diff --git a/values-hub.yaml b/values-hub.yaml index 01ea2477..1e19fc2e 100644 --- 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 @@ -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 diff --git a/values-opphub.yaml b/values-opphub.yaml index 255142e2..3bc3ea4c 100644 --- 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 @@ -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 diff --git a/values-production.yaml b/values-production.yaml index 3767ebd9..1be09740 100644 --- 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 @@ -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: