From 7e0461cd2bb9004b1a2df75703eb3976743f87cc Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 15 Mar 2024 12:23:42 -0600 Subject: [PATCH 1/2] allowing for extra values to be added to the manifest global in the gen3 umbrella chart --- .secrets.baseline | 4 ++-- helm/gen3/Chart.yaml | 2 +- helm/gen3/README.md | 3 ++- helm/gen3/templates/global-manifest.yaml | 7 ++++++- helm/gen3/values.yaml | 2 ++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 3e2f037c..b2328594 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2024-03-11T18:38:21Z", + "generated_at": "2024-03-15T18:22:32Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -330,7 +330,7 @@ "hashed_secret": "9b5925ea817163740dfb287a9894e8ab3aba2c18", "is_secret": false, "is_verified": false, - "line_number": 174, + "line_number": 176, "type": "Secret Keyword" } ], diff --git a/helm/gen3/Chart.yaml b/helm/gen3/Chart.yaml index 20b04b9d..d06ea3e4 100644 --- a/helm/gen3/Chart.yaml +++ b/helm/gen3/Chart.yaml @@ -115,7 +115,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.24 +version: 0.1.25 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/helm/gen3/README.md b/helm/gen3/README.md index 46b928f0..4c12848b 100644 --- a/helm/gen3/README.md +++ b/helm/gen3/README.md @@ -1,6 +1,6 @@ # gen3 -![Version: 0.1.24](https://img.shields.io/badge/Version-0.1.24-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square) +![Version: 0.1.25](https://img.shields.io/badge/Version-0.1.25-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square) Helm chart to deploy Gen3 Data Commons @@ -88,6 +88,7 @@ Helm chart to deploy Gen3 Data Commons | global.externalSecrets.dbCreate | bool | `false` | Will create the databases and store the creds in Kubernetes Secrets even if externalSecrets is deployed. Useful if you want to use ExternalSecrets for other secrets besides db secrets. | | global.externalSecrets.deploy | bool | `false` | Will use ExternalSecret resources to pull secrets from Secrets Manager instead of creating them locally. Be cautious as this will override secrets you have deployed. | | global.hostname | string | `"localhost"` | Hostname for the deployment. | +| global.manifestGlobalExtraValues | map | `nil` | If you would like to add any extra values to the manifest-global configmap. | | global.netPolicy | bool | `true` | Whether network policies are enabled. | | global.portalApp | string | `"gitops"` | Portal application name. | | global.postgres.dbCreate | bool | `true` | Whether the database create job should run. | diff --git a/helm/gen3/templates/global-manifest.yaml b/helm/gen3/templates/global-manifest.yaml index 945088d5..0699a195 100644 --- a/helm/gen3/templates/global-manifest.yaml +++ b/helm/gen3/templates/global-manifest.yaml @@ -16,4 +16,9 @@ data: "dd_enabled": {{ .Values.global.ddEnabled | quote }} {{- with .Values.global.origins_allow_credentials }} "origins_allow_credentials": {{ . | toJson | quote }} - {{- end -}} \ No newline at end of file + {{- end -}} + {{- with .Values.global.manifestGlobalExtraValues }} + {{- range $key, $value := . }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end }} \ No newline at end of file diff --git a/helm/gen3/values.yaml b/helm/gen3/values.yaml index b29b75f1..ea2644ab 100644 --- a/helm/gen3/values.yaml +++ b/helm/gen3/values.yaml @@ -56,6 +56,8 @@ global: dispatcherJobNum: "10" # -- (bool) Whether Datadog is enabled. ddEnabled: false + # -- (map) If you would like to add any extra values to the manifest-global configmap. + manifestGlobalExtraValues: # -- (map) External Secrets settings. externalSecrets: # -- (bool) Will use ExternalSecret resources to pull secrets from Secrets Manager instead of creating them locally. Be cautious as this will override secrets you have deployed. From ddb6fe009820e0ed7fe683942e5b1767577aced3 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 15 Mar 2024 12:39:52 -0600 Subject: [PATCH 2/2] correctly adding value as an empty map --- helm/gen3/README.md | 2 +- helm/gen3/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/gen3/README.md b/helm/gen3/README.md index 4c12848b..3cbd2f8b 100644 --- a/helm/gen3/README.md +++ b/helm/gen3/README.md @@ -88,7 +88,7 @@ Helm chart to deploy Gen3 Data Commons | global.externalSecrets.dbCreate | bool | `false` | Will create the databases and store the creds in Kubernetes Secrets even if externalSecrets is deployed. Useful if you want to use ExternalSecrets for other secrets besides db secrets. | | global.externalSecrets.deploy | bool | `false` | Will use ExternalSecret resources to pull secrets from Secrets Manager instead of creating them locally. Be cautious as this will override secrets you have deployed. | | global.hostname | string | `"localhost"` | Hostname for the deployment. | -| global.manifestGlobalExtraValues | map | `nil` | If you would like to add any extra values to the manifest-global configmap. | +| global.manifestGlobalExtraValues | map | `{}` | If you would like to add any extra values to the manifest-global configmap. | | global.netPolicy | bool | `true` | Whether network policies are enabled. | | global.portalApp | string | `"gitops"` | Portal application name. | | global.postgres.dbCreate | bool | `true` | Whether the database create job should run. | diff --git a/helm/gen3/values.yaml b/helm/gen3/values.yaml index ea2644ab..6dcc3cdf 100644 --- a/helm/gen3/values.yaml +++ b/helm/gen3/values.yaml @@ -57,7 +57,7 @@ global: # -- (bool) Whether Datadog is enabled. ddEnabled: false # -- (map) If you would like to add any extra values to the manifest-global configmap. - manifestGlobalExtraValues: + manifestGlobalExtraValues: {} # -- (map) External Secrets settings. externalSecrets: # -- (bool) Will use ExternalSecret resources to pull secrets from Secrets Manager instead of creating them locally. Be cautious as this will override secrets you have deployed.