From 588a0671ca55cfc14e751714149b2fb9835fca3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= <dw@edgeless.systems>
Date: Mon, 1 Jul 2024 10:45:33 +0200
Subject: [PATCH] Remove dependency on helm/v2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
---
 MODULE.bazel                            | 1 -
 go.mod                                  | 1 -
 go.sum                                  | 2 --
 internal/constellation/helm/BUILD.bazel | 2 +-
 internal/constellation/helm/loader.go   | 2 +-
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index 5ed772ece..5915ea1f3 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -139,7 +139,6 @@ use_repo(
     "org_golang_x_vuln",
     "org_libvirt_go_libvirt",
     "org_uber_go_goleak",
-    "sh_helm_helm",
     "sh_helm_helm_v3",
 )
 
diff --git a/go.mod b/go.mod
index 576d4febd..a526bb547 100644
--- a/go.mod
+++ b/go.mod
@@ -124,7 +124,6 @@ require (
 	google.golang.org/grpc v1.64.0
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/yaml.v3 v3.0.1
-	helm.sh/helm v2.17.0+incompatible
 	helm.sh/helm/v3 v3.15.2
 	k8s.io/api v0.30.2
 	k8s.io/apiextensions-apiserver v0.30.2
diff --git a/go.sum b/go.sum
index cdc111c70..bf0751860 100644
--- a/go.sum
+++ b/go.sum
@@ -1072,8 +1072,6 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
 gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
-helm.sh/helm v2.17.0+incompatible h1:cSe3FaQOpRWLDXvTObQNj0P7WI98IG5yloU6tQVls2k=
-helm.sh/helm v2.17.0+incompatible/go.mod h1:0Xbc6ErzwWH9qC55X1+hE3ZwhM3atbhCm/NbFZw5i+4=
 helm.sh/helm/v3 v3.15.2 h1:/3XINUFinJOBjQplGnjw92eLGpgXXp1L8chWPkCkDuw=
 helm.sh/helm/v3 v3.15.2/go.mod h1:FzSIP8jDQaa6WAVg9F+OkKz7J0ZmAga4MABtTbsb9WQ=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/internal/constellation/helm/BUILD.bazel b/internal/constellation/helm/BUILD.bazel
index c02eb53f0..8ab09ef41 100644
--- a/internal/constellation/helm/BUILD.bazel
+++ b/internal/constellation/helm/BUILD.bazel
@@ -492,11 +492,11 @@ go_library(
         "@io_k8s_client_go//restmapper",
         "@io_k8s_client_go//tools/clientcmd",
         "@io_k8s_client_go//util/retry",
-        "@sh_helm_helm//pkg/ignore",
         "@sh_helm_helm_v3//pkg/action",
         "@sh_helm_helm_v3//pkg/chart",
         "@sh_helm_helm_v3//pkg/chart/loader",
         "@sh_helm_helm_v3//pkg/chartutil",
+        "@sh_helm_helm_v3//pkg/ignore",
         "@sh_helm_helm_v3//pkg/release",
     ],
 )
diff --git a/internal/constellation/helm/loader.go b/internal/constellation/helm/loader.go
index c9badd4cc..09b83cd68 100644
--- a/internal/constellation/helm/loader.go
+++ b/internal/constellation/helm/loader.go
@@ -15,9 +15,9 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"helm.sh/helm/pkg/ignore"
 	"helm.sh/helm/v3/pkg/chart"
 	"helm.sh/helm/v3/pkg/chart/loader"
+	"helm.sh/helm/v3/pkg/ignore"
 
 	"github.com/edgelesssys/constellation/v2/internal/attestation/variant"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"