Merge pull request #18272 from hakman/drop-helm-dep

chore: drop helm dependency and fork strvals

Author: k8s-ci-robot

cmd/kops/toolbox_template.go

@@ -25,17 +25,15 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"helm.sh/helm/v3/pkg/strvals"
-	"k8s.io/kops/pkg/commands/commandutils"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
 	"sigs.k8s.io/yaml"
 
-	helmvalues "helm.sh/helm/v3/pkg/cli/values"
-
 	kopsapi "k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/commands/commandutils"
 	"k8s.io/kops/pkg/try"
 	"k8s.io/kops/pkg/util/templater"
+	"k8s.io/kops/third_party/forked/helmstrvals"
 	"k8s.io/kops/upup/pkg/fi/utils"
 )
 
@@ -250,30 +248,20 @@ func newTemplateContext(files []string, values []string, stringValues []string)
 			if err := utils.YamlUnmarshal(content, &ctx); err != nil {
 				return nil, fmt.Errorf("unable decode the configuration file: %s, error: %v", j, err)
 			}
-
-			valueOpts := &helmvalues.Options{
-				Values:       values,
-				ValueFiles:   files,
-				StringValues: stringValues,
-			}
-
-			context, err = valueOpts.MergeValues(nil)
-			if err != nil {
-				return nil, err
-			}
+			context = mergeMaps(context, ctx)
 		}
 	}
 
 	// User specified a value via --set
 	for _, value := range values {
-		if err := strvals.ParseInto(value, context); err != nil {
+		if err := helmstrvals.ParseInto(value, context); err != nil {
 			return nil, fmt.Errorf("failed parsing --set data: %s", err)
 		}
 	}
 
 	// User specified a value via --set-string
 	for _, value := range stringValues {
-		if err := strvals.ParseIntoString(value, context); err != nil {
+		if err := helmstrvals.ParseIntoString(value, context); err != nil {
 			return nil, fmt.Errorf("failed parsing --set-string data: %s", err)
 		}
 	}
@@ -307,3 +295,22 @@ func expandFiles(path string) ([]string, error) {
 
 	return list, nil
 }
+
+// mergeMaps deep-merges src into dst, returning the result. Nested maps are
+// recursively merged; other values from src overwrite dst.
+func mergeMaps(dst, src map[string]interface{}) map[string]interface{} {
+	out := make(map[string]interface{}, len(dst))
+	for k, v := range dst {
+		out[k] = v
+	}
+	for k, v := range src {
+		if vmap, ok := v.(map[string]interface{}); ok {
+			if existing, ok := out[k].(map[string]interface{}); ok {
+				out[k] = mergeMaps(existing, vmap)
+				continue
+			}
+		}
+		out[k] = v
+	}
+	return out
+}

go.mod

@@ -83,7 +83,6 @@ require (
 	google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
 	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/inf.v0 v0.9.1
-	helm.sh/helm/v3 v3.19.4
 	k8s.io/api v0.36.0
 	k8s.io/apimachinery v0.36.0
 	k8s.io/cli-runtime v0.36.0
@@ -139,17 +138,12 @@ require (
 	github.com/charmbracelet/x/ansi v0.10.1 // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
 	github.com/charmbracelet/x/term v0.2.1 // indirect
-	github.com/containerd/containerd v1.7.29 // indirect
-	github.com/containerd/errdefs v1.0.0 // indirect
-	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.18.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/docker/cli v29.0.3+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.9.3 // indirect
-	github.com/docker/go-events v0.0.0-20250114142523-c867878c5e32 // indirect
 	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/evanphx/json-patch v5.9.11+incompatible // indirect
@@ -222,7 +216,6 @@ require (
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.67.5 // indirect
@@ -265,7 +258,6 @@ require (
 	k8s.io/apiextensions-apiserver v0.36.0 // indirect
 	k8s.io/cloud-provider v0.36.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
-	oras.land/oras-go/v2 v2.6.0 // indirect
 	sigs.k8s.io/gateway-api v1.4.0 // indirect
 	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
 	sigs.k8s.io/kustomize/api v0.21.1 // indirect

go.sum

@@ -0,0 +1,31 @@
+// Copyright The Helm Authors.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package helmstrvals is an in-tree copy of helm.sh/helm/v3/pkg/strvals at tag
+// v3.19.4. It is forked rather than imported so kops does not pull in the
+// helm module just for "--set k=v" parsing in `kops toolbox template`.
+//
+// Modifications relative to upstream:
+//
+//   - removed unused public APIs: Parse, ParseString, ToYAML, ParseFile,
+//     ParseIntoFile, ParseJSON, ParseLiteralInto and the literal_parser
+//     supporting them; only ParseInto and ParseIntoString are kept
+//   - removed the JSON-value and file-value branches in (*parser).key and
+//     (*parser).listItem along with the isjsonval field, newJSONParser,
+//     newFileParser, RunesValueReader, and (*parser).emptyVal
+//   - replaced the reader callback with an inlined typedVal call (the
+//     callback existed only to dispatch between string and JSON/file
+//     readers, which are no longer present)
+//   - inlined the inMap helper as a direct map index in runesUntil
+//   - github.com/pkg/errors replaced with stdlib errors and fmt.Errorf("%w")
+package helmstrvals