common: update the corresponding wranger v3 imports

- Also update the generated code Signed-off-by: Vicente Cheng <[email protected]>
harvester · Aug 2, 2024 · bc64eda · bc64eda
1 parent 67b3083
commit bc64eda
Show file tree

Hide file tree

Showing 22 changed files with 182 additions and 65 deletions.
diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go
@@ -7,8 +7,8 @@ import (
 	"github.com/harvester/webhook/pkg/config"
 	"github.com/harvester/webhook/pkg/server"
 	"github.com/harvester/webhook/pkg/server/admission"
-	"github.com/rancher/wrangler/pkg/kubeconfig"
-	"github.com/rancher/wrangler/pkg/signals"
+	"github.com/rancher/wrangler/v3/pkg/kubeconfig"
+	"github.com/rancher/wrangler/v3/pkg/signals"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	"k8s.io/client-go/rest"

diff --git a/main.go b/main.go
@@ -14,9 +14,9 @@ import (
 	"time"
 
 	"github.com/ehazlett/simplelog"
-	ctlnode "github.com/rancher/wrangler/pkg/generated/controllers/core"
-	"github.com/rancher/wrangler/pkg/signals"
-	"github.com/rancher/wrangler/pkg/start"
+	ctlnode "github.com/rancher/wrangler/v3/pkg/generated/controllers/core"
+	"github.com/rancher/wrangler/v3/pkg/signals"
+	"github.com/rancher/wrangler/v3/pkg/start"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	"k8s.io/client-go/tools/clientcmd"

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/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
@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	controllergen "github.com/rancher/wrangler/pkg/controller-gen"
-	"github.com/rancher/wrangler/pkg/controller-gen/args"
+	controllergen "github.com/rancher/wrangler/v3/pkg/controller-gen"
+	"github.com/rancher/wrangler/v3/pkg/controller-gen/args"
 
 	nodev1beta1 "github.com/harvester/node-manager/pkg/apis/node.harvesterhci.io/v1beta1"
 )

diff --git a/pkg/controller/cloudinit/controller.go b/pkg/controller/cloudinit/controller.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	ctlnodev1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
+	ctlnodev1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 	corev1 "k8s.io/api/core/v1"

diff --git a/pkg/controller/ksmtuned/controller.go b/pkg/controller/ksmtuned/controller.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	ctlnode "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
+	ctlnode "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
 	"github.com/sirupsen/logrus"
 
 	ksmtunedv1 "github.com/harvester/node-manager/pkg/apis/node.harvesterhci.io/v1beta1"

diff --git a/pkg/controller/nodeconfig/config/ntp.go b/pkg/controller/nodeconfig/config/ntp.go
@@ -14,7 +14,7 @@ import (
 
 	gocommon "github.com/harvester/go-common"
 	"github.com/mudler/yip/pkg/schema"
-	ctlnode "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
+	ctlnode "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/controller/nodeconfig/controller.go b/pkg/controller/nodeconfig/controller.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	gocommon "github.com/harvester/go-common"
-	ctlnode "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
+	ctlnode "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
 	"github.com/sirupsen/logrus"
 
 	nodeconfigv1 "github.com/harvester/node-manager/pkg/apis/node.harvesterhci.io/v1beta1"

diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go
diff --git a/pkg/generated/clientset/versioned/doc.go b/pkg/generated/clientset/versioned/doc.go
diff --git a/pkg/generated/clientset/versioned/typed/node.harvesterhci.io/v1beta1/fake/fake_cloudinit.go b/pkg/generated/clientset/versioned/typed/node.harvesterhci.io/v1beta1/fake/fake_cloudinit.go
diff --git a/pkg/generated/clientset/versioned/typed/node.harvesterhci.io/v1beta1/fake/fake_ksmtuned.go b/pkg/generated/clientset/versioned/typed/node.harvesterhci.io/v1beta1/fake/fake_ksmtuned.go
diff --git a/pkg/generated/clientset/versioned/typed/node.harvesterhci.io/v1beta1/fake/fake_nodeconfig.go b/pkg/generated/clientset/versioned/typed/node.harvesterhci.io/v1beta1/fake/fake_nodeconfig.go
diff --git a/pkg/generated/controllers/node.harvesterhci.io/factory.go b/pkg/generated/controllers/node.harvesterhci.io/factory.go
diff --git a/pkg/generated/controllers/node.harvesterhci.io/v1beta1/cloudinit.go b/pkg/generated/controllers/node.harvesterhci.io/v1beta1/cloudinit.go
diff --git a/pkg/generated/controllers/node.harvesterhci.io/v1beta1/interface.go b/pkg/generated/controllers/node.harvesterhci.io/v1beta1/interface.go