9 Commits (261233caec499c18602c61ac32507fa4656ebc9b)

Author	SHA1	Message	Date
Matt Farina	0a5148faff	Fix multiple bugs in values handling ... First, some notes about priority and how some code flow works. For Helm handling values, the expected order of precidence is: 1. User specified values (e.g CLI) 2. Imported values 3. Parent chart values 4. Subchart values Helm handles dependency values slightly differently. If there are dependencies in the charts folder that are not marked as dependencies all of the values, including nil values, are pulled in. If those charts are listed as a dependency in the Chart.yaml file than they are processed for import handling. Prior to the changes here, it caused nil values at the top level to NOT remove values specified. The changes: 1. The order of priority was chagned from the list above. Parnet chart values would override specifically imported values. This is due to a change from just over a year ago that introduced a bug. That was undone by changing the precidence when maps were merged. 2. To handle merging while retaining the nil values, which was causing inconsistent behavior, a new set of Merge functions were introduced. These functions are just like coalesce except that they DO NOT remove nil/null values. The new functions are used in a backward compatible manner meaning some new functions were introduced that called them. Specific issues fixed (that are known): Closes #9027 Can now delete subkeys from charts when specified in the parent. This behavior was previously inconsistent. Sometimes they could be deleted and other times it did not work. Now it is consistent. Closes #10899 Imported values (from library or other subcharts) are now used following the order above. The previous behavior was inconsistent. import-values using just a string would import them. When named with a child/parent it did not work if the parent already had a value. If string and named were mixed the imports worked if the string happened first but just for the string not the named. If the named parent/child went first then none of them worked for cases where the parent already had a value. It was inconsistent and the tests sometimes mirrored the functionality rather than expected behavior. Tests for this fall into the sub-packages and are in the template tests to verify it's happening in the output. Including having values passed at the CLI as the ultimate highest priority to be used. This relates to a fix that went in for #9940. The expected values there don't fit the precedence above where the parent value would override the imported value. That fix/change introduced more bugs. Closes #10052 This is the case where imported values using the parent/child designation just didn't work right. That has been fixed and there are tests. The underlying issue had to do with the precedence order handling. Note, a lot of tests were added. Hope we got it more right this time. Signed-off-by: Matt Farina <matt.farina@suse.com>	1 year ago
Damien Nozay	9fa373e8be	Make validation errors easier to fix ... Problem: the warnings don't give enough details about which values are problematic, only the name of the leaf key. This is all the more annoying when you have a chart depending on other charts. ``` mainchart | +- subchart1 +- subchart2 +- subchart3 ``` Here are some warnings I get before the change: ``` coalesce.go:199: warning: destination for credentials is a table. Ignoring non-table value coalesce.go:160: warning: skipped value for resources: Not a table. coalesce.go:160: warning: skipped value for googleSheetsServiceAccount: Not a table. coalesce.go:199: warning: destination for googleSheetsServiceAccount is a table. Ignoring non-table value coalesce.go:199: warning: destination for resources is a table. Ignoring non-table value [] coalesce.go:199: warning: destination for credentials is a table. Ignoring non-table value coalesce.go:199: warning: destination for credentials is a table. Ignoring non-table value coalesce.go:160: warning: skipped value for resources: Not a table. coalesce.go:160: warning: skipped value for googleSheetsServiceAccount: Not a table. ``` with fix: ``` coalesce.go:162: warning: skipped value for subchart1.resources: Not a table. coalesce.go:162: warning: skipped value for subchart2.googleSheetsServiceAccount: Not a table. coalesce.go:211: warning: destination for subchart3.aws.credentials is a table. Ignoring non-table value () coalesce.go:211: warning: destination for mainchart.subchart3.aws.credentials is a table. Ignoring non-table value () coalesce.go:211: warning: destination for mainchart.subchart2.googleSheetsServiceAccount is a table. Ignoring non-table value () coalesce.go:211: warning: destination for mainchart.subchart1.resources is a table. Ignoring non-table value ([]) coalesce.go:162: warning: skipped value for subchart1.resources: Not a table. coalesce.go:162: warning: skipped value for subchart2.googleSheetsServiceAccount: Not a table. coalesce.go:211: warning: destination for subchart3.aws.credentials is a table. Ignoring non-table value () ``` Signed-off-by: Damien Nozay <damiennozay+github@gmail.com> add tests Signed-off-by: Damien Nozay <damiennozay+github@gmail.com>	3 years ago
Bernd Gutjahr	1740e7f89b	enhanced coelesce_test with some more test cases ... Signed-off-by: Bernd Gutjahr <bernd.gutjahr@microfocus.com>	3 years ago
Giacomo Margaria	3b68afc1c8	Fix coalesce globals to prevent subchart globals to leak upstream ... Signed-off-by: Giacomo Margaria <giacomo.margaria@gmail.com>	3 years ago
Adam Reese	3364265e78	ref(pkg/chartutil): use minimal in-memory fixtures ... Signed-off-by: Adam Reese <adam@reese.io>	5 years ago
David Pait	6aefbdcf38	Helm upgrades with --reuse-values and nil user values -- with tests (#7959) ... * return the new values if modifications dont yet exist Signed-off-by: David Pait <DP19@users.noreply.github.com> * fix tests Signed-off-by: David Pait <DP19@users.noreply.github.com> * removed outter if statement as its not needed now Signed-off-by: David Pait <DP19@users.noreply.github.com>	5 years ago
uzxmx	a34f311539	Fix nested null value overrides (#7743) ... * Fix nested null value overrides Signed-off-by: Mingxiang Xue <mingxiangxue@gmail.com> * Fix subchart value deletion Signed-off-by: Mingxiang Xue <mingxiangxue@gmail.com>	5 years ago
Karuppiah Natarajan	25324ca8db	fix install storing computed values in release instead of user supplied values ... Signed-off-by: Karuppiah Natarajan <karuppiah7890@gmail.com>	5 years ago
Adam Reese	b49db9e6e6	ref(pkg/chartutil): break up chartutil into logical files ... Signed-off-by: Adam Reese <adam@reese.io>	6 years ago