Merge branch 'main' into default-observed-generation

Author: makkes

controllers/helmrelease_controller.go

@@ -611,8 +611,19 @@ func (r *HelmReleaseReconciler) composeValues(ctx context.Context, hr v2.HelmRel
 			// TODO(hidde): this is a bit of hack, as it mimics the way the option string is passed
 			// 	to Helm from a CLI perspective. Given the parser is however not publicly accessible
 			// 	while it contains all logic around parsing the target path, it is a fair trade-off.
-			singleValue := v.TargetPath + "=" + string(valuesData)
-			if err := strvals.ParseInto(singleValue, result); err != nil {
+			stringValuesData := string(valuesData)
+			const singleQuote = "'"
+			const doubleQuote = "\""
+			var err error
+			if (strings.HasPrefix(stringValuesData, singleQuote) && strings.HasSuffix(stringValuesData, singleQuote)) || (strings.HasPrefix(stringValuesData, doubleQuote) && strings.HasSuffix(stringValuesData, doubleQuote)) {
+				stringValuesData = strings.Trim(stringValuesData, singleQuote+doubleQuote)
+				singleValue := v.TargetPath + "=" + stringValuesData
+				err = strvals.ParseIntoString(singleValue, result)
+			} else {
+				singleValue := v.TargetPath + "=" + stringValuesData
+				err = strvals.ParseInto(singleValue, result)
+			}
+			if err != nil {
 				return nil, fmt.Errorf("unable to merge value from key '%s' in %s '%s' into target path '%s': %w", v.GetValuesKey(), v.Kind, namespacedName, v.TargetPath, err)
 			}
 		}

controllers/helmrelease_controller_test.go

@@ -107,6 +107,52 @@ other: values
 				},
 			},
 		},
+		{
+			name: "target path with boolean value",
+			resources: []runtime.Object{
+				valuesSecret("values", map[string][]byte{"single": []byte("true")}),
+			},
+			references: []v2.ValuesReference{
+				{
+					Kind:       "Secret",
+					Name:       "values",
+					ValuesKey:  "single",
+					TargetPath: "merge.at.specific.path",
+				},
+			},
+			want: chartutil.Values{
+				"merge": map[string]interface{}{
+					"at": map[string]interface{}{
+						"specific": map[string]interface{}{
+							"path": true,
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "target path with set-string behavior",
+			resources: []runtime.Object{
+				valuesSecret("values", map[string][]byte{"single": []byte("\"true\"")}),
+			},
+			references: []v2.ValuesReference{
+				{
+					Kind:       "Secret",
+					Name:       "values",
+					ValuesKey:  "single",
+					TargetPath: "merge.at.specific.path",
+				},
+			},
+			want: chartutil.Values{
+				"merge": map[string]interface{}{
+					"at": map[string]interface{}{
+						"specific": map[string]interface{}{
+							"path": "true",
+						},
+					},
+				},
+			},
+		},
 		{
 			name: "values reference to non existing secret",
 			references: []v2.ValuesReference{