Deleting merge functions from apptestctl (#62)

* deleting merge functions from apptestctl * adding changelog * Update cmd/bootstrap/runner.go Co-authored-by: Ross Fairbanks <[email protected]> * remove whitespaces (2) Co-authored-by: Ross Fairbanks <[email protected]>
giantswarm · Dec 3, 2020 · 2983d74 · 2983d74
1 parent ca2bd08
commit 2983d74
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Remove helmclient.MergeValue functions usage.
+
 ## [0.5.2] - 2020-12-01
 
 ### Changed

diff --git a/cmd/bootstrap/runner.go b/cmd/bootstrap/runner.go
@@ -568,11 +568,10 @@ func (r *runner) installOperator(ctx context.Context, helmClient helmclient.Inte
 		r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("installing %#q", name))
 
 		// Set control plane operator values so chart-operator DNS settings are
-		// correct. Merge with an empty set of values so YAML is parsed.
-		input := map[string][]byte{
-			"values": []byte(operatorValuesYAML),
-		}
-		values, err := helmclient.MergeValues(input, map[string][]byte{})
+		// correct.
+		var input map[string]interface{}
+
+		err := yaml.Unmarshal([]byte(operatorValuesYAML), &input)
 		if err != nil {
 			return microerror.Mask(err)
 		}
@@ -587,7 +586,7 @@ func (r *runner) installOperator(ctx context.Context, helmClient helmclient.Inte
 		err = helmClient.InstallReleaseFromTarball(ctx,
 			operatorTarballPath,
 			namespace,
-			values,
+			input,
 			opts)
 		if helmclient.IsCannotReuseRelease(err) {
 			r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("%#q already installed", name))