Drop completed TODO

gardener · Feb 19, 2024 · 155ecf3 · 155ecf3
1 parent e7ec6e4
commit 155ecf3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -58,7 +58,6 @@ require (
 	k8s.io/code-generator v0.29.2
 	k8s.io/component-base v0.29.2
 	k8s.io/component-helpers v0.29.2
-	k8s.io/helm v2.17.0+incompatible
 	k8s.io/klog/v2 v2.110.1
 	k8s.io/kube-aggregator v0.29.2
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00

diff --git a/go.sum b/go.sum
@@ -1077,8 +1077,6 @@ k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
 k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks=
 k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/helm v2.17.0+incompatible h1:Bpn6o1wKLYqKM3+Osh8e+1/K2g/GsQJ4F4yNF2+deao=
-k8s.io/helm v2.17.0+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

diff --git a/pkg/chartrenderer/default.go b/pkg/chartrenderer/default.go
@@ -29,11 +29,11 @@ import (
 	helmloader "helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/chartutil"
 	"helm.sh/helm/v3/pkg/engine"
+	"helm.sh/helm/v3/pkg/ignore"
 	"helm.sh/helm/v3/pkg/releaseutil"
 	"k8s.io/apimachinery/pkg/version"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/rest"
-	"k8s.io/helm/pkg/ignore"
 )
 
 const notesFileSuffix = "NOTES.txt"
@@ -221,10 +221,9 @@ func (c *RenderedChart) AsSecretData() map[string][]byte {
 }
 
 // loadEmbeddedFS is a copy of helm.sh/helm/v3/pkg/chart/loader.LoadDir with the difference that it uses an embed.FS.
-// Keep this func in sync with https://github.com/helm/helm/blob/v3.10.3/pkg/chart/loader/directory.go#L44-L120.
+// Keep this func in sync with https://github.com/helm/helm/blob/v3.14.1/pkg/chart/loader/directory.go#L43-L120.
 func loadEmbeddedFS(embeddedFS embed.FS, chartPath string) (*helmchart.Chart, error) {
 	var (
-		// TODO(acumino): Replace "k8s.io/helm/pkg/ignore" with "helm.sh/helm/v3/pkg/ignore" when we upgrade to a helm version that contains https://github.com/helm/helm/pull/12662.
 		rules = ignore.Empty()
 		files []*helmloader.BufferedFile
 	)