Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Oct 23, 2023
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab96e0d
Add cluster overrides
Oct 17, 2023
8feb8c8
Add sharedValueFiles to all clusterGroup files
Oct 17, 2023
2e8f6ea
Clean up spacing and stray error markers
Oct 18, 2023
f173290
Update overrides directory and references
Oct 18, 2023
28031ca
Move sharedValueFiles declaration by common consent
Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 values-AWS-4.10.yaml → overrides/values-AWS-4.10.yaml
View file
Open in desktop
File renamed without changes.
0 values-AWS-4.12.yaml → overrides/values-AWS-4.12.yaml
View file
Open in desktop
File renamed without changes.
0 values-AWS.yaml → overrides/values-AWS.yaml
View file
Open in desktop
File renamed without changes.
0 values-Azure-4.10.yaml → overrides/values-Azure-4.10.yaml
View file
Open in desktop
File renamed without changes.
0 values-Azure.yaml → overrides/values-Azure.yaml
View file
Open in desktop
File renamed without changes.
0 values-GCP-4.10.yaml → overrides/values-GCP-4.10.yaml
View file
Open in desktop
File renamed without changes.
0 values-GCP.yaml → overrides/values-GCP.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions values-all-in-one.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,10 @@ 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
Expand Down
6 changes: 5 additions & 1 deletion values-development.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- '/overrides/values-{{ $.Values.global.clusterPlatform }}.yaml'
- '/overrides/values-{{ $.Values.global.clusterPlatform }}-{{ $.Values.global.clusterVersion }}.yaml' # E:

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move this to just before the applications section?

# To have apps in multiple flavors, use namespaces and use helm overrides as appropriate
#
# - name: pipelines
Expand Down
4 changes: 4 additions & 0 deletions values-hub.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ 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
Expand Down
4 changes: 4 additions & 0 deletions values-opphub.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ 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
Expand Down
4 changes: 4 additions & 0 deletions values-production.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,7 @@ 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:
Loading