diff --git a/CHANGELOG.md b/CHANGELOG.md index 677218454fca570c41578ab5c15182d41449a010..13a8219419bb58389accef55a4ac7752d3f4d420 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-04-30 +### Changed +- Package charts now pass through all bigbang values in the package values so they can be referenced from package value files with template functions + ## [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/package/values.yaml b/chart/templates/package/values.yaml index b2ef1a9a382fd78c9b13ac20f08a2e78ecfa5c0f..d8409b36070c1d0b115da2aa74ae5e7c5ce5b5bc 100644 --- a/chart/templates/package/values.yaml +++ b/chart/templates/package/values.yaml @@ -3,6 +3,9 @@ {{- if (dig "enabled" true $vals) -}} {{- $pkg = include "resourceName" $pkg -}} {{- $defaults := $.Files.Get (printf "defaults/%s.yaml" $pkg) -}} +{{- $bbvars := pick $.Values "domain" "networkPolicies" -}} +{{- $merged := mergeOverwrite $vals.values $bbvars -}} +{{- $_ := set $vals "values" $merged -}} {{- if $defaults -}} {{- $vals := mergeOverwrite $vals ($defaults | fromYaml).package -}} {{- end -}}