bump to wrangler v3 (#234)

Signed-off-by: galal-hussein <[email protected]>
k3s-io · May 2, 2024 · 2f32059 · 2f32059
1 parent d74a09d
commit 2f32059
Show file tree

Hide file tree

Showing 15 changed files with 143 additions and 117 deletions.
diff --git a/go.mod b/go.mod
@@ -1,38 +1,40 @@
 module github.com/k3s-io/helm-controller
 
-go 1.20
+go 1.22.0
+
+toolchain go1.22.2
 
 require (
-	github.com/onsi/ginkgo/v2 v2.9.4
-	github.com/onsi/gomega v1.27.6
-	github.com/rancher/lasso v0.0.0-20240415182150-5993b260dd08
+	github.com/onsi/ginkgo/v2 v2.15.0
+	github.com/onsi/gomega v1.31.0
+	github.com/rancher/lasso v0.0.0-20240430201833-6f3def65ffc5
 	github.com/rancher/wrangler-cli v0.0.0-20220624114648-479c5692ba22
-	github.com/rancher/wrangler/v2 v2.2.0-rc5
+	github.com/rancher/wrangler/v3 v3.0.0-rc2
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.7.0
 	github.com/stretchr/testify v1.9.0
-	k8s.io/api v0.28.6
-	k8s.io/apimachinery v0.28.6
-	k8s.io/client-go v0.28.6
+	k8s.io/api v0.30.0
+	k8s.io/apimachinery v0.30.0
+	k8s.io/client-go v0.30.0
 	k8s.io/klog v1.0.0
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -65,16 +67,17 @@ require (
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.20.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.28.6 // indirect
-	k8s.io/code-generator v0.28.6 // indirect
-	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
+	k8s.io/apiextensions-apiserver v0.30.0 // indirect
+	k8s.io/code-generator v0.30.0 // indirect
+	k8s.io/gengo v0.0.0-20240228010128-51d4e06bde70 // indirect
+	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
+	k8s.io/klog/v2 v2.120.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/hack/crdgen.go b/hack/crdgen.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/k3s-io/helm-controller/pkg/crd"
 	_ "github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1"
-	wcrd "github.com/rancher/wrangler/v2/pkg/crd"
+	wcrd "github.com/rancher/wrangler/v3/pkg/crd"
 )
 
 func main() {

diff --git a/main.go b/main.go
@@ -11,11 +11,11 @@ import (
 	"github.com/k3s-io/helm-controller/pkg/crd"
 	"github.com/k3s-io/helm-controller/pkg/version"
 	command "github.com/rancher/wrangler-cli"
-	wcrd "github.com/rancher/wrangler/v2/pkg/crd"
-	_ "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io"
-	_ "github.com/rancher/wrangler/v2/pkg/generated/controllers/networking.k8s.io"
-	"github.com/rancher/wrangler/v2/pkg/kubeconfig"
-	"github.com/rancher/wrangler/v2/pkg/ratelimit"
+	wcrd "github.com/rancher/wrangler/v3/pkg/crd"
+	_ "github.com/rancher/wrangler/v3/pkg/generated/controllers/apiextensions.k8s.io"
+	_ "github.com/rancher/wrangler/v3/pkg/generated/controllers/networking.k8s.io"
+	"github.com/rancher/wrangler/v3/pkg/kubeconfig"
+	"github.com/rancher/wrangler/v3/pkg/ratelimit"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"

diff --git a/pkg/codegen/cleanup/main.go b/pkg/codegen/cleanup/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/rancher/wrangler/v2/pkg/cleanup"
+	"github.com/rancher/wrangler/v3/pkg/cleanup"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/pkg/codegen/main.go b/pkg/codegen/main.go
@@ -5,8 +5,8 @@ import (
 
 	v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1"
 
-	controllergen "github.com/rancher/wrangler/v2/pkg/controller-gen"
-	"github.com/rancher/wrangler/v2/pkg/controller-gen/args"
+	controllergen "github.com/rancher/wrangler/v3/pkg/controller-gen"
+	"github.com/rancher/wrangler/v3/pkg/controller-gen/args"
 )
 
 func main() {

diff --git a/pkg/controllers/chart/chart.go b/pkg/controllers/chart/chart.go
@@ -13,12 +13,12 @@ import (
 	v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1"
 	helmcontroller "github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1"
 	"github.com/k3s-io/helm-controller/pkg/remove"
-	"github.com/rancher/wrangler/v2/pkg/apply"
-	batchcontroller "github.com/rancher/wrangler/v2/pkg/generated/controllers/batch/v1"
-	corecontroller "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1"
-	rbaccontroller "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac/v1"
-	"github.com/rancher/wrangler/v2/pkg/generic"
-	"github.com/rancher/wrangler/v2/pkg/relatedresource"
+	"github.com/rancher/wrangler/v3/pkg/apply"
+	batchcontroller "github.com/rancher/wrangler/v3/pkg/generated/controllers/batch/v1"
+	corecontroller "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
+	rbaccontroller "github.com/rancher/wrangler/v3/pkg/generated/controllers/rbac/v1"
+	"github.com/rancher/wrangler/v3/pkg/generic"
+	"github.com/rancher/wrangler/v3/pkg/relatedresource"
 	batch "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	rbac "k8s.io/api/rbac/v1"

diff --git a/pkg/controllers/controllers.go b/pkg/controllers/controllers.go
@@ -11,18 +11,18 @@ import (
 	"github.com/rancher/lasso/pkg/cache"
 	"github.com/rancher/lasso/pkg/client"
 	"github.com/rancher/lasso/pkg/controller"
-	"github.com/rancher/wrangler/v2/pkg/apply"
-	"github.com/rancher/wrangler/v2/pkg/generated/controllers/batch"
-	batchcontroller "github.com/rancher/wrangler/v2/pkg/generated/controllers/batch/v1"
-	"github.com/rancher/wrangler/v2/pkg/generated/controllers/core"
-	corecontroller "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1"
-	"github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac"
-	rbaccontroller "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac/v1"
-	"github.com/rancher/wrangler/v2/pkg/generic"
-	"github.com/rancher/wrangler/v2/pkg/leader"
-	"github.com/rancher/wrangler/v2/pkg/ratelimit"
-	"github.com/rancher/wrangler/v2/pkg/schemes"
-	"github.com/rancher/wrangler/v2/pkg/start"
+	"github.com/rancher/wrangler/v3/pkg/apply"
+	"github.com/rancher/wrangler/v3/pkg/generated/controllers/batch"
+	batchcontroller "github.com/rancher/wrangler/v3/pkg/generated/controllers/batch/v1"
+	"github.com/rancher/wrangler/v3/pkg/generated/controllers/core"
+	corecontroller "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
+	"github.com/rancher/wrangler/v3/pkg/generated/controllers/rbac"
+	rbaccontroller "github.com/rancher/wrangler/v3/pkg/generated/controllers/rbac/v1"
+	"github.com/rancher/wrangler/v3/pkg/generic"
+	"github.com/rancher/wrangler/v3/pkg/leader"
+	"github.com/rancher/wrangler/v3/pkg/ratelimit"
+	"github.com/rancher/wrangler/v3/pkg/schemes"
+	"github.com/rancher/wrangler/v3/pkg/start"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"

diff --git a/pkg/crd/crds.go b/pkg/crd/crds.go
@@ -2,7 +2,7 @@ package crd
 
 import (
 	v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1"
-	"github.com/rancher/wrangler/v2/pkg/crd"
+	"github.com/rancher/wrangler/v3/pkg/crd"
 )
 
 func List() []crd.CRD {

diff --git a/pkg/generated/controllers/helm.cattle.io/factory.go b/pkg/generated/controllers/helm.cattle.io/factory.go
diff --git a/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go b/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go
diff --git a/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go b/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go
diff --git a/pkg/generated/controllers/helm.cattle.io/v1/interface.go b/pkg/generated/controllers/helm.cattle.io/v1/interface.go
diff --git a/pkg/remove/handler.go b/pkg/remove/handler.go
@@ -3,7 +3,7 @@ package remove
 import (
 	"context"
 
-	"github.com/rancher/wrangler/v2/pkg/generic"
+	"github.com/rancher/wrangler/v3/pkg/generic"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

diff --git a/test/framework/framework.go b/test/framework/framework.go
@@ -17,8 +17,8 @@ import (
 	helmcrd "github.com/k3s-io/helm-controller/pkg/crd"
 	helmcln "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned"
 	"github.com/onsi/ginkgo/v2"
-	"github.com/rancher/wrangler/v2/pkg/condition"
-	"github.com/rancher/wrangler/v2/pkg/crd"
+	"github.com/rancher/wrangler/v3/pkg/condition"
+	"github.com/rancher/wrangler/v3/pkg/crd"
 	"github.com/sirupsen/logrus"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"