Skip to content

Commit

Permalink
wrangler: update wrangler to v3
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Chiu <[email protected]>wq
  • Loading branch information
mingshuoqiu committed Jan 9, 2025
1 parent 50f1073 commit 6017634
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions cmd/network-controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"os"

"github.com/rancher/wrangler/pkg/leader"
"github.com/rancher/wrangler/pkg/signals"
"github.com/rancher/wrangler/v3/pkg/leader"
"github.com/rancher/wrangler/v3/pkg/signals"
"github.com/urfave/cli"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
Expand Down
14 changes: 7 additions & 7 deletions pkg/config/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"github.com/harvester/harvester/pkg/util/crd"
cniv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
"github.com/rancher/lasso/pkg/controller"
wcrd "github.com/rancher/wrangler/pkg/crd"
ctlapps "github.com/rancher/wrangler/pkg/generated/controllers/apps"
ctlbatch "github.com/rancher/wrangler/pkg/generated/controllers/batch"
ctlcore "github.com/rancher/wrangler/pkg/generated/controllers/core"
"github.com/rancher/wrangler/pkg/generic"
"github.com/rancher/wrangler/pkg/schemes"
"github.com/rancher/wrangler/pkg/start"
wcrd "github.com/rancher/wrangler/v3/pkg/crd"
ctlapps "github.com/rancher/wrangler/v3/pkg/generated/controllers/apps"
ctlbatch "github.com/rancher/wrangler/v3/pkg/generated/controllers/batch"
ctlcore "github.com/rancher/wrangler/v3/pkg/generated/controllers/core"
"github.com/rancher/wrangler/v3/pkg/generic"
"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/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/agent/linkmonitor/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

ctlcorev1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
ctlcorev1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/vishvananda/netlink"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/klog/v2"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/agent/vlanconfig/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"

ctlcniv1 "github.com/harvester/harvester/pkg/generated/controllers/k8s.cni.cncf.io/v1"
ctlcorev1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
ctlcorev1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/vishvananda/netlink"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/manager/nad/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/go-ping/ping"
ctlcniv1 "github.com/harvester/harvester/pkg/generated/controllers/k8s.cni.cncf.io/v1"
cniv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
ctlbatchv1 "github.com/rancher/wrangler/pkg/generated/controllers/batch/v1"
ctlbatchv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/batch/v1"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6017634

Please sign in to comment.