diff --git a/README.md b/README.md index 518b0e68..6505400f 100644 --- a/README.md +++ b/README.md @@ -239,7 +239,7 @@ import ( "context" "github.com/rancher/steve/pkg/server" - "github.com/rancher/wrangler/pkg/kubeconfig" + "github.com/rancher/wrangler/v2/pkg/kubeconfig" ) func steve() error { diff --git a/go.mod b/go.mod index e64dd6d2..11bc0d61 100644 --- a/go.mod +++ b/go.mod @@ -17,12 +17,12 @@ require ( github.com/pborman/uuid v1.2.1 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 - github.com/rancher/apiserver v0.0.0-20230831052300-120e615b17ba - github.com/rancher/dynamiclistener v0.3.6-rc2.0.20230831052350-0132d96ec2c5 + github.com/rancher/apiserver v0.0.0-20240124133512-e93bfa07e5f1 + github.com/rancher/dynamiclistener v0.5.0-rc1 github.com/rancher/kubernetes-provider-detector v0.1.5 github.com/rancher/norman v0.0.0-20230831160711-5de27f66385d github.com/rancher/remotedialer v0.3.0 - 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 github.com/urfave/cli v1.22.14 diff --git a/go.sum b/go.sum index 2085aff8..0b59023f 100644 --- a/go.sum +++ b/go.sum @@ -511,12 +511,12 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rancher/apiserver v0.0.0-20230831052300-120e615b17ba h1:ceAHvddZkuNbUTuMgqxYAcUSQ/+YtJQO9Z1PHjmQZBY= -github.com/rancher/apiserver v0.0.0-20230831052300-120e615b17ba/go.mod h1:1m5KKYXq6iMZFQ5kiC9rBgVLfGRNR8E+lp88f5tEAsI= +github.com/rancher/apiserver v0.0.0-20240124133512-e93bfa07e5f1 h1:RM0EOF/4aEbbb7x8VsBAKUG3hcuDOmp2aLqgXa7XqfM= +github.com/rancher/apiserver v0.0.0-20240124133512-e93bfa07e5f1/go.mod h1:JaFbxL5U5YH72tCeKkDM9kM8238hCyOKocr/S2T3wus= github.com/rancher/client-go v1.27.4-rancher1 h1:1W1A0bV6KXYbu1z+KIezlfLsHPc1wiasAM42BICVKBM= github.com/rancher/client-go v1.27.4-rancher1/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc= -github.com/rancher/dynamiclistener v0.3.6-rc2.0.20230831052350-0132d96ec2c5 h1:qmGPmNYbW2SQwlou9oOjDYbHwU+iAfw1FVMGqv+aDsM= -github.com/rancher/dynamiclistener v0.3.6-rc2.0.20230831052350-0132d96ec2c5/go.mod h1:VqBaJNi+bZmre0+gi+2Jb6jbn7ovHzRueW+M7QhVKsk= +github.com/rancher/dynamiclistener v0.5.0-rc1 h1:ax9/IFFfL3svjQwA8bTY6XKG26vwmdPsCV0v00S7hSY= +github.com/rancher/dynamiclistener v0.5.0-rc1/go.mod h1:RX6NcryWL1ew6wngAx0R478Q0DTtTthvxI+9+fAqZHM= github.com/rancher/kubernetes-provider-detector v0.1.5 h1:hWRAsWuJOemzGjz/XrbTlM7QmfO4OedvFE3QwXiH60I= github.com/rancher/kubernetes-provider-detector v0.1.5/go.mod h1:ypuJS7kP7rUiAn330xG46mj+Nhvym05GM8NqMVekpH0= github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 h1:+kige/h8/LnzWgPjB5NUIHz/pWiW/lFpqcTUkN5uulY= @@ -525,8 +525,8 @@ github.com/rancher/norman v0.0.0-20230831160711-5de27f66385d h1:Ft/iTH91TlE2oBGm github.com/rancher/norman v0.0.0-20230831160711-5de27f66385d/go.mod h1:Sm2Xqai+aecgmJ86ygyEe+TdPMLkauEpykSstBAu4Ko= github.com/rancher/remotedialer v0.3.0 h1:y1EO8JCsgZo0RcqTUp6U8FXcBAv27R+TLnWRcpvX1sM= github.com/rancher/remotedialer v0.3.0/go.mod h1:BwwztuvViX2JrLLUwDlsYt5DiyUwHLlzynRwkZLAY0Q= -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/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= diff --git a/main.go b/main.go index 29b7de6e..eb81280c 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/steve/pkg/debug" stevecli "github.com/rancher/steve/pkg/server/cli" "github.com/rancher/steve/pkg/version" - "github.com/rancher/wrangler/pkg/signals" + "github.com/rancher/wrangler/v2/pkg/signals" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/pkg/accesscontrol/access_control.go b/pkg/accesscontrol/access_control.go index 391cc7e0..7a8b32ad 100644 --- a/pkg/accesscontrol/access_control.go +++ b/pkg/accesscontrol/access_control.go @@ -4,7 +4,7 @@ import ( apiserver "github.com/rancher/apiserver/pkg/server" "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/attributes" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/kv" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/accesscontrol/access_store.go b/pkg/accesscontrol/access_store.go index 562edf08..95cc3efd 100644 --- a/pkg/accesscontrol/access_store.go +++ b/pkg/accesscontrol/access_store.go @@ -7,7 +7,7 @@ import ( "sort" "time" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac/v1" "k8s.io/apimachinery/pkg/util/cache" "k8s.io/apiserver/pkg/authentication/user" ) diff --git a/pkg/accesscontrol/policy_rule_index.go b/pkg/accesscontrol/policy_rule_index.go index b6e0aac2..4ed91dc1 100644 --- a/pkg/accesscontrol/policy_rule_index.go +++ b/pkg/accesscontrol/policy_rule_index.go @@ -5,7 +5,7 @@ import ( "hash" "sort" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/accesscontrol/role_revision_index.go b/pkg/accesscontrol/role_revision_index.go index e6ee05ca..09871da6 100644 --- a/pkg/accesscontrol/role_revision_index.go +++ b/pkg/accesscontrol/role_revision_index.go @@ -4,8 +4,8 @@ import ( "context" "sync" - rbac "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" - "github.com/rancher/wrangler/pkg/kv" + rbac "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac/v1" + "github.com/rancher/wrangler/v2/pkg/kv" rbacv1 "k8s.io/api/rbac/v1" ) diff --git a/pkg/aggregation/watch.go b/pkg/aggregation/watch.go index 263b65d5..cb311c03 100644 --- a/pkg/aggregation/watch.go +++ b/pkg/aggregation/watch.go @@ -5,7 +5,7 @@ import ( "context" "net/http" - 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" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/attributes/attributes.go b/pkg/attributes/attributes.go index 81be0b34..fdd2419b 100644 --- a/pkg/attributes/attributes.go +++ b/pkg/attributes/attributes.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/rancher/apiserver/pkg/types" - "github.com/rancher/wrangler/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/data/convert" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/clustercache/controller.go b/pkg/clustercache/controller.go index 8da49041..3dc982b1 100644 --- a/pkg/clustercache/controller.go +++ b/pkg/clustercache/controller.go @@ -8,9 +8,9 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/attributes" "github.com/rancher/steve/pkg/schema" - "github.com/rancher/wrangler/pkg/merr" - "github.com/rancher/wrangler/pkg/summary/client" - "github.com/rancher/wrangler/pkg/summary/informer" + "github.com/rancher/wrangler/v2/pkg/merr" + "github.com/rancher/wrangler/v2/pkg/summary/client" + "github.com/rancher/wrangler/v2/pkg/summary/informer" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controllers/schema/schemas.go b/pkg/controllers/schema/schemas.go index cd5441c2..2bc09096 100644 --- a/pkg/controllers/schema/schemas.go +++ b/pkg/controllers/schema/schemas.go @@ -11,8 +11,8 @@ import ( "github.com/rancher/steve/pkg/resources/common" schema2 "github.com/rancher/steve/pkg/schema" "github.com/rancher/steve/pkg/schema/converter" - apiextcontrollerv1 "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/apiregistration.k8s.io/v1" + apiextcontrollerv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiregistration.k8s.io/v1" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" diff --git a/pkg/podimpersonation/podimpersonation.go b/pkg/podimpersonation/podimpersonation.go index 01b82169..9a8b14c5 100644 --- a/pkg/podimpersonation/podimpersonation.go +++ b/pkg/podimpersonation/podimpersonation.go @@ -8,9 +8,9 @@ import ( "time" "github.com/rancher/steve/pkg/stores/proxy" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/randomtoken" - "github.com/rancher/wrangler/pkg/schemas/validation" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/randomtoken" + "github.com/rancher/wrangler/v2/pkg/schemas/validation" "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" diff --git a/pkg/resources/cluster/apply.go b/pkg/resources/cluster/apply.go index 9e35257c..9ef1a602 100644 --- a/pkg/resources/cluster/apply.go +++ b/pkg/resources/cluster/apply.go @@ -11,8 +11,8 @@ import ( "github.com/rancher/steve/pkg/attributes" steveschema "github.com/rancher/steve/pkg/schema" "github.com/rancher/steve/pkg/stores/proxy" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/yaml" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/yaml" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/resources/cluster/cluster.go b/pkg/resources/cluster/cluster.go index 7d5b8abe..294771ab 100644 --- a/pkg/resources/cluster/cluster.go +++ b/pkg/resources/cluster/cluster.go @@ -11,8 +11,8 @@ import ( "github.com/rancher/steve/pkg/attributes" steveschema "github.com/rancher/steve/pkg/schema" "github.com/rancher/steve/pkg/stores/proxy" - "github.com/rancher/wrangler/pkg/genericcondition" - "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/genericcondition" + "github.com/rancher/wrangler/v2/pkg/schemas" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" schema2 "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/version" diff --git a/pkg/resources/cluster/cluster_type.go b/pkg/resources/cluster/cluster_type.go index e20387dd..5b00f53f 100644 --- a/pkg/resources/cluster/cluster_type.go +++ b/pkg/resources/cluster/cluster_type.go @@ -1,7 +1,7 @@ package cluster import ( - "github.com/rancher/wrangler/pkg/genericcondition" + "github.com/rancher/wrangler/v2/pkg/genericcondition" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/version" ) diff --git a/pkg/resources/common/dynamiccolumns.go b/pkg/resources/common/dynamiccolumns.go index dfe3af10..774b2e20 100644 --- a/pkg/resources/common/dynamiccolumns.go +++ b/pkg/resources/common/dynamiccolumns.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/attributes" - "github.com/rancher/wrangler/pkg/ratelimit" + "github.com/rancher/wrangler/v2/pkg/ratelimit" "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" diff --git a/pkg/resources/common/formatter.go b/pkg/resources/common/formatter.go index 6ac320a4..53743919 100644 --- a/pkg/resources/common/formatter.go +++ b/pkg/resources/common/formatter.go @@ -10,10 +10,10 @@ import ( metricsStore "github.com/rancher/steve/pkg/stores/metrics" "github.com/rancher/steve/pkg/stores/proxy" "github.com/rancher/steve/pkg/summarycache" - "github.com/rancher/wrangler/pkg/data" - corecontrollers "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" - "github.com/rancher/wrangler/pkg/slice" - "github.com/rancher/wrangler/pkg/summary" + "github.com/rancher/wrangler/v2/pkg/data" + corecontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/v2/pkg/slice" + "github.com/rancher/wrangler/v2/pkg/summary" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/resources/counts/counts.go b/pkg/resources/counts/counts.go index cb859dc1..9a210eab 100644 --- a/pkg/resources/counts/counts.go +++ b/pkg/resources/counts/counts.go @@ -10,7 +10,7 @@ import ( "github.com/rancher/steve/pkg/accesscontrol" "github.com/rancher/steve/pkg/attributes" "github.com/rancher/steve/pkg/clustercache" - "github.com/rancher/wrangler/pkg/summary" + "github.com/rancher/wrangler/v2/pkg/summary" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" schema2 "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/resources/counts/counts_test.go b/pkg/resources/counts/counts_test.go index 755706e0..d1e705ba 100644 --- a/pkg/resources/counts/counts_test.go +++ b/pkg/resources/counts/counts_test.go @@ -15,8 +15,8 @@ import ( "github.com/rancher/steve/pkg/clustercache" "github.com/rancher/steve/pkg/resources/counts" "github.com/rancher/steve/pkg/schema" - "github.com/rancher/wrangler/pkg/schemas" - "github.com/rancher/wrangler/pkg/summary" + "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/summary" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" schema2 "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/resources/schema.go b/pkg/resources/schema.go index 148f9e2c..4bb18b8f 100644 --- a/pkg/resources/schema.go +++ b/pkg/resources/schema.go @@ -19,7 +19,7 @@ import ( steveschema "github.com/rancher/steve/pkg/schema" "github.com/rancher/steve/pkg/stores/proxy" "github.com/rancher/steve/pkg/summarycache" - corecontrollers "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" + corecontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/client-go/discovery" ) diff --git a/pkg/resources/schemas/template.go b/pkg/resources/schemas/template.go index 99c47dfb..b459004a 100644 --- a/pkg/resources/schemas/template.go +++ b/pkg/resources/schemas/template.go @@ -12,8 +12,8 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/accesscontrol" "github.com/rancher/steve/pkg/schema" - "github.com/rancher/wrangler/pkg/broadcast" - "github.com/rancher/wrangler/pkg/schemas/validation" + "github.com/rancher/wrangler/v2/pkg/broadcast" + "github.com/rancher/wrangler/v2/pkg/schemas/validation" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apiserver/pkg/authentication/user" diff --git a/pkg/resources/schemas/template_test.go b/pkg/resources/schemas/template_test.go index 8ce53b39..52d70a83 100644 --- a/pkg/resources/schemas/template_test.go +++ b/pkg/resources/schemas/template_test.go @@ -15,7 +15,7 @@ import ( "github.com/rancher/steve/pkg/attributes" "github.com/rancher/steve/pkg/resources/schemas" schemafake "github.com/rancher/steve/pkg/schema/fake" - v1schema "github.com/rancher/wrangler/pkg/schemas" + v1schema "github.com/rancher/wrangler/v2/pkg/schemas" "github.com/stretchr/testify/assert" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/endpoints/request" diff --git a/pkg/schema/collection.go b/pkg/schema/collection.go index 1701f359..dfb5fa7c 100644 --- a/pkg/schema/collection.go +++ b/pkg/schema/collection.go @@ -10,7 +10,7 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/accesscontrol" "github.com/rancher/steve/pkg/attributes" - "github.com/rancher/wrangler/pkg/name" + "github.com/rancher/wrangler/v2/pkg/name" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/cache" diff --git a/pkg/schema/converter/crd.go b/pkg/schema/converter/crd.go index 874f8a62..5aa06f21 100644 --- a/pkg/schema/converter/crd.go +++ b/pkg/schema/converter/crd.go @@ -4,8 +4,8 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/attributes" "github.com/rancher/steve/pkg/schema/table" - apiextv1 "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1" - "github.com/rancher/wrangler/pkg/schemas" + apiextv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io/v1" + "github.com/rancher/wrangler/v2/pkg/schemas" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/schema/converter/discovery.go b/pkg/schema/converter/discovery.go index 058a0d49..e2337a26 100644 --- a/pkg/schema/converter/discovery.go +++ b/pkg/schema/converter/discovery.go @@ -5,8 +5,8 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/attributes" - "github.com/rancher/wrangler/pkg/merr" - "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/merr" + "github.com/rancher/wrangler/v2/pkg/schemas" "github.com/sirupsen/logrus" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/schema/converter/k8stonorman.go b/pkg/schema/converter/k8stonorman.go index 1c3c9415..ee6e47ed 100644 --- a/pkg/schema/converter/k8stonorman.go +++ b/pkg/schema/converter/k8stonorman.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/rancher/apiserver/pkg/types" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/discovery" ) diff --git a/pkg/schema/converter/openapi.go b/pkg/schema/converter/openapi.go index 9ef16493..6a1d4563 100644 --- a/pkg/schema/converter/openapi.go +++ b/pkg/schema/converter/openapi.go @@ -3,8 +3,8 @@ package converter import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/attributes" - "github.com/rancher/wrangler/pkg/data/convert" - "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/schemas" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/discovery" diff --git a/pkg/schema/converter/openapiv3.go b/pkg/schema/converter/openapiv3.go index d9082dd6..ee7bc78d 100644 --- a/pkg/schema/converter/openapiv3.go +++ b/pkg/schema/converter/openapiv3.go @@ -2,7 +2,7 @@ package converter import ( "github.com/rancher/apiserver/pkg/types" - "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/schemas" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" ) diff --git a/pkg/schema/factory_test.go b/pkg/schema/factory_test.go index c9dc6f67..bc9ac419 100644 --- a/pkg/schema/factory_test.go +++ b/pkg/schema/factory_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/rancher/apiserver/pkg/types" - "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/schemas" k8sSchema "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/authentication/user" ) diff --git a/pkg/schema/table/mapper.go b/pkg/schema/table/mapper.go index 64d4da36..d4046de5 100644 --- a/pkg/schema/table/mapper.go +++ b/pkg/schema/table/mapper.go @@ -3,9 +3,9 @@ package table import ( types2 "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/attributes" - "github.com/rancher/wrangler/pkg/data" - types "github.com/rancher/wrangler/pkg/schemas" - "github.com/rancher/wrangler/pkg/schemas/mappers" + "github.com/rancher/wrangler/v2/pkg/data" + types "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/schemas/mappers" ) type Column struct { diff --git a/pkg/server/cli/clicontext.go b/pkg/server/cli/clicontext.go index 08fee604..0e40c7f0 100644 --- a/pkg/server/cli/clicontext.go +++ b/pkg/server/cli/clicontext.go @@ -7,8 +7,8 @@ import ( authcli "github.com/rancher/steve/pkg/auth/cli" "github.com/rancher/steve/pkg/server" "github.com/rancher/steve/pkg/ui" - "github.com/rancher/wrangler/pkg/kubeconfig" - "github.com/rancher/wrangler/pkg/ratelimit" + "github.com/rancher/wrangler/v2/pkg/kubeconfig" + "github.com/rancher/wrangler/v2/pkg/ratelimit" "github.com/urfave/cli" ) diff --git a/pkg/server/config.go b/pkg/server/config.go index af742649..f4acd45e 100644 --- a/pkg/server/config.go +++ b/pkg/server/config.go @@ -4,17 +4,17 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io" - apiextensionsv1 "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1" - "github.com/rancher/wrangler/pkg/generated/controllers/apiregistration.k8s.io" - apiregistrationv1 "github.com/rancher/wrangler/pkg/generated/controllers/apiregistration.k8s.io/v1" - "github.com/rancher/wrangler/pkg/generated/controllers/core" - corev1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" - "github.com/rancher/wrangler/pkg/generated/controllers/rbac" - rbacv1 "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/ratelimit" - "github.com/rancher/wrangler/pkg/start" + "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io" + apiextensionsv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io/v1" + "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiregistration.k8s.io" + apiregistrationv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiregistration.k8s.io/v1" + "github.com/rancher/wrangler/v2/pkg/generated/controllers/core" + corev1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac" + rbacv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac/v1" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/ratelimit" + "github.com/rancher/wrangler/v2/pkg/start" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" ) diff --git a/pkg/stores/partition/listprocessor/processor.go b/pkg/stores/partition/listprocessor/processor.go index f028e5a9..485ff207 100644 --- a/pkg/stores/partition/listprocessor/processor.go +++ b/pkg/stores/partition/listprocessor/processor.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/rancher/apiserver/pkg/types" - "github.com/rancher/wrangler/pkg/data" - "github.com/rancher/wrangler/pkg/data/convert" - corecontrollers "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/v2/pkg/data" + "github.com/rancher/wrangler/v2/pkg/data/convert" + corecontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/stores/partition/listprocessor/processor_test.go b/pkg/stores/partition/listprocessor/processor_test.go index 19075edc..b81d4d86 100644 --- a/pkg/stores/partition/listprocessor/processor_test.go +++ b/pkg/stores/partition/listprocessor/processor_test.go @@ -3,7 +3,7 @@ package listprocessor import ( "testing" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/stores/partition/store.go b/pkg/stores/partition/store.go index 0fb36a69..fc5677fb 100644 --- a/pkg/stores/partition/store.go +++ b/pkg/stores/partition/store.go @@ -13,7 +13,7 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/accesscontrol" "github.com/rancher/steve/pkg/stores/partition/listprocessor" - corecontrollers "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" + corecontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/stores/partition/store_test.go b/pkg/stores/partition/store_test.go index bfab28ac..101c197c 100644 --- a/pkg/stores/partition/store_test.go +++ b/pkg/stores/partition/store_test.go @@ -12,8 +12,8 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/accesscontrol" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemas" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/stores/proxy/error_wrapper.go b/pkg/stores/proxy/error_wrapper.go index 01af8d10..a4515b37 100644 --- a/pkg/stores/proxy/error_wrapper.go +++ b/pkg/stores/proxy/error_wrapper.go @@ -3,7 +3,7 @@ package proxy import ( "github.com/rancher/apiserver/pkg/apierror" "github.com/rancher/apiserver/pkg/types" - "github.com/rancher/wrangler/pkg/schemas/validation" + "github.com/rancher/wrangler/v2/pkg/schemas/validation" "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/pkg/stores/proxy/proxy_store.go b/pkg/stores/proxy/proxy_store.go index 82d3c0dc..6cdd63d5 100644 --- a/pkg/stores/proxy/proxy_store.go +++ b/pkg/stores/proxy/proxy_store.go @@ -18,10 +18,10 @@ import ( "github.com/rancher/steve/pkg/attributes" metricsStore "github.com/rancher/steve/pkg/stores/metrics" "github.com/rancher/steve/pkg/stores/partition" - "github.com/rancher/wrangler/pkg/data" - corecontrollers "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" - "github.com/rancher/wrangler/pkg/schemas/validation" - "github.com/rancher/wrangler/pkg/summary" + "github.com/rancher/wrangler/v2/pkg/data" + corecontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/v2/pkg/schemas/validation" + "github.com/rancher/wrangler/v2/pkg/summary" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/stores/proxy/proxy_store_test.go b/pkg/stores/proxy/proxy_store_test.go index ad1d352c..a43a082a 100644 --- a/pkg/stores/proxy/proxy_store_test.go +++ b/pkg/stores/proxy/proxy_store_test.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/client" - "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/schemas" "github.com/stretchr/testify/assert" "golang.org/x/sync/errgroup" v1 "k8s.io/api/core/v1" diff --git a/pkg/stores/proxy/rbac_store.go b/pkg/stores/proxy/rbac_store.go index 8835f698..e76535e0 100644 --- a/pkg/stores/proxy/rbac_store.go +++ b/pkg/stores/proxy/rbac_store.go @@ -8,7 +8,7 @@ import ( "github.com/rancher/steve/pkg/accesscontrol" "github.com/rancher/steve/pkg/attributes" "github.com/rancher/steve/pkg/stores/partition" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/kv" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/stores/proxy/rbac_store_test.go b/pkg/stores/proxy/rbac_store_test.go index 3feb9326..c60109d1 100644 --- a/pkg/stores/proxy/rbac_store_test.go +++ b/pkg/stores/proxy/rbac_store_test.go @@ -6,7 +6,7 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/accesscontrol" "github.com/rancher/steve/pkg/stores/partition" - "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/schemas" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/pkg/stores/proxy/unformatter.go b/pkg/stores/proxy/unformatter.go index eb70aae9..8d5905ad 100644 --- a/pkg/stores/proxy/unformatter.go +++ b/pkg/stores/proxy/unformatter.go @@ -2,8 +2,8 @@ package proxy import ( "github.com/rancher/apiserver/pkg/types" - "github.com/rancher/wrangler/pkg/data" - "github.com/rancher/wrangler/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/data" + "github.com/rancher/wrangler/v2/pkg/data/convert" ) // unformatterStore removes fields added by the formatter that kubernetes cannot recognize. diff --git a/pkg/summarycache/summarycache.go b/pkg/summarycache/summarycache.go index 326bacdf..dfb6845b 100644 --- a/pkg/summarycache/summarycache.go +++ b/pkg/summarycache/summarycache.go @@ -10,8 +10,8 @@ import ( "github.com/rancher/steve/pkg/clustercache" "github.com/rancher/steve/pkg/schema" "github.com/rancher/steve/pkg/schema/converter" - "github.com/rancher/wrangler/pkg/slice" - "github.com/rancher/wrangler/pkg/summary" + "github.com/rancher/wrangler/v2/pkg/slice" + "github.com/rancher/wrangler/v2/pkg/summary" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime"