Upgrade wrangler v2

charts/fleet-crd/templates/crds.yaml

@@ -1455,7 +1455,7 @@ spec:
                         partition clusters if no specific partitioning strategy is
                         configured. default: 25%'
                       nullable: true
-                      type: string
+                      x-kubernetes-int-or-string: true
                     maxUnavailable:
                       description: 'A number or percentage of clusters that can be
                         unavailable during an update of a bundle. This follows the
@@ -1464,13 +1464,13 @@ spec:
                         be paused. Default value is 100% which doesn''t take effect
                         on update. default: 100%'
                       nullable: true
-                      type: string
+                      x-kubernetes-int-or-string: true
                     maxUnavailablePartitions:
                       description: 'A number or percentage of cluster partitions that
                         can be unavailable during an update of a bundle. default:
                         0'
                       nullable: true
-                      type: string
+                      x-kubernetes-int-or-string: true
                     partitions:
                       description: A list of definitions of partitions.  If any target
                         clusters do not match the configuration they are added to
@@ -1595,7 +1595,7 @@ spec:
                               can be unavailable in this partition before this partition
                               is treated as done. default: 10%'
                             nullable: true
-                            type: string
+                            x-kubernetes-int-or-string: true
                           name:
                             description: A user-friendly name given to the partition
                               used for Display (optional).

cmd/codegen/cleanup/main.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"github.com/rancher/wrangler/pkg/cleanup"
+	"github.com/rancher/wrangler/v2/pkg/cleanup"
 )
 
 func main() {

cmd/codegen/main.go

@@ -5,11 +5,11 @@ import (
 	"os"
 
 	"github.com/rancher/fleet/pkg/crd"
-	controllergen "github.com/rancher/wrangler/pkg/controller-gen"
-	"github.com/rancher/wrangler/pkg/controller-gen/args"
+	controllergen "github.com/rancher/wrangler/v2/pkg/controller-gen"
+	"github.com/rancher/wrangler/v2/pkg/controller-gen/args"
 
-	// Ensure gvk gets loaded in wrangler/pkg/gvk cache
-	_ "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1"
+	// Ensure gvk gets loaded in wrangler/v2/pkg/gvk cache
+	_ "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io/v1"
 
 	// To keep the dependency in go.mod
 	_ "sigs.k8s.io/controller-tools/pkg/crd"

cmd/fleetagent/main.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/rancher/fleet/internal/cmd/agent"
 
-	"github.com/rancher/wrangler/pkg/signals"
+	"github.com/rancher/wrangler/v2/pkg/signals"
 	"github.com/sirupsen/logrus"
 )
 

cmd/fleetcli/main.go

@@ -4,15 +4,15 @@ package main
 import (
 	// Ensure GVKs are registered
 	_ "github.com/rancher/fleet/pkg/generated/controllers/fleet.cattle.io"
-	_ "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io"
-	_ "github.com/rancher/wrangler/pkg/generated/controllers/apps"
-	_ "github.com/rancher/wrangler/pkg/generated/controllers/core"
-	_ "github.com/rancher/wrangler/pkg/generated/controllers/rbac"
+	_ "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io"
+	_ "github.com/rancher/wrangler/v2/pkg/generated/controllers/apps"
+	_ "github.com/rancher/wrangler/v2/pkg/generated/controllers/core"
+	_ "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac"
 
 	// Add non-default auth providers
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
-	"github.com/rancher/wrangler/pkg/signals"
+	"github.com/rancher/wrangler/v2/pkg/signals"
 	"github.com/sirupsen/logrus"
 
 	cmds "github.com/rancher/fleet/internal/cmd/cli"

cmd/fleetcontroller/main.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/rancher/fleet/internal/cmd/controller"
 
-	_ "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io"
-	_ "github.com/rancher/wrangler/pkg/generated/controllers/networking.k8s.io"
-	"github.com/rancher/wrangler/pkg/signals"
+	_ "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/signals"
 	"github.com/sirupsen/logrus"
 )
 

e2e/testenv/infra/go.mod

@@ -44,15 +44,15 @@ require (
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/onsi/ginkgo/v2 v2.12.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.13.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.14.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/rancher/gitjob v0.1.82 // indirect
+	github.com/prometheus/client_golang v1.16.0 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/rancher/gitjob v0.1.103 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.opentelemetry.io/otel v1.14.0 // indirect