Merge branch 'master' into no-pkg-errors

mittwald · Aug 9, 2024 · 67a43ec · 67a43ec
2 parents b4ba8cd + ee0d3c4
commit 67a43ec
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/client.go b/client.go
@@ -8,10 +8,9 @@ import (
 	"log"
 	"os"
 	"reflect"
+	"slices"
 	"strings"
 
-	"golang.org/x/exp/slices"
-
 	"k8s.io/apimachinery/pkg/api/errors"
 
 	"github.com/spf13/pflag"

diff --git a/go.mod b/go.mod
@@ -5,7 +5,6 @@ go 1.22.0
 require (
 	github.com/spf13/pflag v1.0.5
 	go.uber.org/mock v0.4.0
-	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
 	helm.sh/helm/v3 v3.15.2
 	k8s.io/apiextensions-apiserver v0.30.0
 	k8s.io/apimachinery v0.30.0

diff --git a/go.sum b/go.sum
@@ -368,8 +368,6 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
-golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=