diff --git a/CHANGELOG.md b/CHANGELOG.md
index 677218454fca570c41578ab5c15182d41449a010..2a159149841d6fc0fc7ce5b70d032d2bb3437ebb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
---
+## [2.25.1] - 2024-05-01
+### Changed
+- Package charts now pass through bigbang values in the package values the same way the wrapper chart does, via a toplevel $.bigbang key
+
## [2.25.0]
- [!2.25.0](https://repo1.dso.mil/big-bang/bigbang/-/merge_requests?scope=all&utf8=%E2%9C%93&state=merged&milestone_title=2.25.0); List of merge requests in this release.
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index d2c85ddd8ca84cbaf7ce99fe16fa75b1270a936f..f8d4d18ec1c6fb7d5ca943409af01cf638922e49 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,22 +1,17 @@
apiVersion: v2
name: bigbang
-version: 2.25.0
+version: 2.25.1
description: Big Bang is a declarative, continuous delivery tool for core DoD hardened and approved packages into a Kubernetes cluster.
-
type: application
-
keywords:
- platform1
- bigbang
-
home: https://p1.dso.mil/products/big-bang
sources:
- https://repo1.dso.mil/big-bang/bigbang
-
maintainers:
- name: Michael Martin
email: michaelmartin@seed-innovations.com
- name: Chris O'Connell
email: coconnell@bridgephase.com
-
icon: https://p1.dso.mil/img/Big_Bang_Color_Logo_White_text.b04263b1.png
diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
index 3ccf2c539441650bdd26ca66287662003e6d4121..a972c4d62aec28a689642b276d129906937dfd33 100644
--- a/chart/templates/_helpers.tpl
+++ b/chart/templates/_helpers.tpl
@@ -1,3 +1,45 @@
+{{- define "values-bigbang" -}}
+{{- /*
+ * bigbang.values-bigbang: Produce a stripped version of the bigbang variables
+ * in the root namespace suitable for inclusion in wrapper or package variables definitions
+ */ -}}
+{{ toYaml (pick $ "domain" "openshift") }}
+{{- /* For every top level map, if it has the enable key, pass it through. */ -}}
+{{- range $bbpkg, $bbvals := $ -}}
+ {{- if kindIs "map" $bbvals -}}
+ {{- if hasKey $bbvals "enabled" }}
+{{ $bbpkg }}:
+ {{- /* For network policies, we need all of its values. */ -}}
+ {{- if eq $bbpkg "networkPolicies" -}}
+ {{- toYaml $bbvals | nindent 2}}
+ {{- else }}
+ enabled: {{ $bbvals.enabled }}
+ {{- end -}}
+ {{- /* For addons, pass through the enable key. */ -}}
+ {{- else if eq $bbpkg "addons" }}
+{{ $bbpkg }}:
+ {{- range $addpkg, $addvals := $bbvals -}}
+ {{- if hasKey $addvals "enabled" }}
+ {{ $addpkg }}:
+ enabled: {{ $addvals.enabled }}
+ {{- /* For authservice, the selector values are needed. */ -}}
+ {{- if and (eq $addpkg "authservice") (or (dig "values" "selector" "key" false $addvals) (dig "values" "selector" "value" false $addvals)) }}
+ values:
+ selector:
+ {{- if (dig "values" "selector" "key" false $addvals) }}
+ key: {{ $addvals.values.selector.key }}
+ {{- end -}}
+ {{- if (dig "values" "selector" "value" false $addvals) }}
+ value: {{ $addvals.values.selector.key }}
+ {{- end -}}
+ {{- end -}}
+ {{- end -}}
+ {{- end -}}
+ {{- end -}}
+ {{- end -}}
+{{- end -}}
+{{- end }}
+
{{- define "imagePullSecret" }}
{{- if .Values.registryCredentials -}}
{{- $credType := typeOf .Values.registryCredentials -}}
@@ -394,3 +436,5 @@ data:
{{- end -}}
{{- end -}}
{{- end -}}
+
+
diff --git a/chart/templates/package/values.yaml b/chart/templates/package/values.yaml
index b2ef1a9a382fd78c9b13ac20f08a2e78ecfa5c0f..9937ad5e90fd6c83a72b2b03f4abdc11015099e4 100644
--- a/chart/templates/package/values.yaml
+++ b/chart/templates/package/values.yaml
@@ -17,6 +17,8 @@ type: Opaque
stringData:
{{ if and (dig "enabled" true $vals) (not $vals.kustomize) -}}
values.yaml: |
+ bigbang:
+ {{- include "values-bigbang" $.Values | nindent 6 }}
{{- tpl (toYaml $vals.values) $ | nindent 4 }}
{{ else }}
{{- tpl (toYaml $vals.values) $ | nindent 2 }}
diff --git a/chart/templates/wrapper/values.yaml b/chart/templates/wrapper/values.yaml
index 8606a78f601f9305a85c7128e0429159c1f21043..7c05114408ef044798ca653be3d94af234afe408 100644
--- a/chart/templates/wrapper/values.yaml
+++ b/chart/templates/wrapper/values.yaml
@@ -19,41 +19,7 @@ stringData:
{{- tpl (toYaml (omit $merged.package "git" "helmRepo" "flux" "postRenderers" "dependsOn")) $ | nindent 6 }}
{{- end }}
bigbang:
- {{- toYaml (pick $merged.bigbang "domain" "openshift") | nindent 6 -}}
- {{- /* For every top level map, if it has the enable key, pass it through. */ -}}
- {{- range $bbpkg, $bbvals := $merged.bigbang -}}
- {{- if kindIs "map" $bbvals -}}
- {{- if hasKey $bbvals "enabled" -}}
- {{- $bbpkg | nindent 6 -}}:
- {{- /* For network policies, we need all of its values. */ -}}
- {{- if eq $bbpkg "networkPolicies" -}}
- {{- toYaml $bbvals | nindent 8 -}}
- {{- else }}
- enabled: {{ $bbvals.enabled }}
- {{- end -}}
- {{- /* For addons, pass through the enable key. */ -}}
- {{- else if eq $bbpkg "addons" -}}
- {{- $bbpkg | nindent 6 -}}:
- {{- range $addpkg, $addvals := $bbvals -}}
- {{- if hasKey $addvals "enabled" -}}
- {{- $addpkg | nindent 8 }}:
- enabled: {{ $addvals.enabled }}
- {{- /* For authservice, the selector values are needed. */ -}}
- {{- if and (eq $addpkg "authservice") (or (dig "values" "selector" "key" false $addvals) (dig "values" "selector" "value" false $addvals)) }}
- values:
- selector:
- {{- if (dig "values" "selector" "key" false $addvals) -}}
- key: {{ $addvals.values.selector.key }}
- {{- end -}}
- {{- if (dig "values" "selector" "value" false $addvals) -}}
- value: {{ $addvals.values.selector.key }}
- {{- end -}}
- {{- end -}}
- {{- end -}}
- {{- end -}}
- {{- end -}}
- {{- end -}}
- {{- end }}
+ {{- include "values-bigbang" $merged.bigbang | nindent 6 }}
---
{{ end -}}
{{- end -}}
\ No newline at end of file