diff --git a/go.mod b/go.mod index cc12a7f..49e3b9e 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/rancher/dynamiclistener go 1.20 require ( - github.com/rancher/wrangler v1.1.1-0.20230831050635-df1bd5aae9df + github.com/rancher/wrangler/v2 v2.0.2 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.8.4 golang.org/x/crypto v0.11.0 diff --git a/go.sum b/go.sum index 0ceedf9..633dd0a 100644 --- a/go.sum +++ b/go.sum @@ -232,8 +232,8 @@ github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 h1:+kige/h8/LnzWgPjB5NUIHz/pWiW/lFpqcTUkN5uulY= github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29/go.mod h1:kgk9kJVMj9FIrrXU0iyM6u/9Je4bEjPImqswkTVaKsQ= -github.com/rancher/wrangler v1.1.1-0.20230831050635-df1bd5aae9df h1:WJ+aaUICHPX8HeLmHE9JL/RFHhilMfcJlqmhgpc7gJU= -github.com/rancher/wrangler v1.1.1-0.20230831050635-df1bd5aae9df/go.mod h1:4T80p+rLh2OLbjCjdExIjRHKNBgK9NUAd7eIU/gRPKk= +github.com/rancher/wrangler/v2 v2.0.2 h1:EWaWaD5Gnh8gGcLzglf/zktyuaiTi6e95c0T2RivVi8= +github.com/rancher/wrangler/v2 v2.0.2/go.mod h1:p0YJmpbUbEQ1CE1GIbhwa9gCXeBJOBsQ6F6+Nf3LeLo= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= diff --git a/server/server.go b/server/server.go index f4b5280..984a240 100644 --- a/server/server.go +++ b/server/server.go @@ -15,7 +15,7 @@ import ( "github.com/rancher/dynamiclistener/storage/file" "github.com/rancher/dynamiclistener/storage/kubernetes" "github.com/rancher/dynamiclistener/storage/memory" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" "github.com/sirupsen/logrus" "golang.org/x/crypto/acme/autocert" ) diff --git a/storage/kubernetes/ca.go b/storage/kubernetes/ca.go index 18a07e0..bbef990 100644 --- a/storage/kubernetes/ca.go +++ b/storage/kubernetes/ca.go @@ -5,7 +5,7 @@ import ( "crypto/x509" "github.com/rancher/dynamiclistener/factory" - v1controller "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" + v1controller "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/storage/kubernetes/controller.go b/storage/kubernetes/controller.go index 2af33a6..c682d8b 100644 --- a/storage/kubernetes/controller.go +++ b/storage/kubernetes/controller.go @@ -7,9 +7,9 @@ import ( "github.com/rancher/dynamiclistener" "github.com/rancher/dynamiclistener/cert" - "github.com/rancher/wrangler/pkg/generated/controllers/core" - v1controller "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" - "github.com/rancher/wrangler/pkg/start" + "github.com/rancher/wrangler/v2/pkg/generated/controllers/core" + v1controller "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/v2/pkg/start" "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors"