actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-04-20 02:35:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update pkg/runtime to v0.8.2

Browse source 
pkg/runtime v0.8.2 introduces runtime/transform which includes
`MergeMaps`:
https://github.com/fluxcd/pkg/pull/85

Signed-off-by: Dylan Arbour <arbourd@users.noreply.github.com>
This commit is contained in:
Dylan Arbour 2021-02-15 18:05:36 -05:00
parent 298d6a1a15
commit 99002f92f4
4 changed files with 5 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmd/flux/create_helmrelease.go
View file

@ -25,6 +25,7 @@ import (
"github.com/fluxcd/flux2/internal/flags"
"github.com/fluxcd/flux2/internal/utils"
"github.com/fluxcd/pkg/apis/meta"
"github.com/fluxcd/pkg/runtime/transform"
"github.com/spf13/cobra"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@ -198,7 +199,7 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
if valuesMap == nil {
valuesMap = jsonMap
} else {
valuesMap = utils.MergeMaps(valuesMap, jsonMap)
valuesMap = transform.MergeMaps(valuesMap, jsonMap)
}
}