From dae842ea98257023ea06f501555bc3f9860e0410 Mon Sep 17 00:00:00 2001 From: vardhaman22 Date: Wed, 5 Jun 2024 00:22:48 +0530 Subject: [PATCH] updated wrangler from v2 to v3 also updated k8s dependencies to v0.30.1 --- README.md | 2 +- go.mod | 21 +++++----- go.sum | 42 ++++++++++--------- main.go | 2 +- pkg/accesscontrol/access_control.go | 2 +- pkg/accesscontrol/access_store.go | 2 +- pkg/accesscontrol/policy_rule_index.go | 2 +- pkg/accesscontrol/role_revision_index.go | 4 +- pkg/aggregation/watch.go | 2 +- pkg/attributes/attributes.go | 2 +- pkg/clustercache/controller.go | 6 +-- pkg/controllers/schema/schemas.go | 4 +- pkg/podimpersonation/podimpersonation.go | 6 +-- pkg/resources/cluster/apply.go | 4 +- pkg/resources/cluster/cluster.go | 4 +- pkg/resources/cluster/cluster_type.go | 2 +- pkg/resources/common/dynamiccolumns.go | 2 +- pkg/resources/common/formatter.go | 8 ++-- pkg/resources/counts/counts.go | 2 +- pkg/resources/counts/counts_test.go | 4 +- pkg/resources/schema.go | 2 +- pkg/resources/schemas/template.go | 4 +- pkg/resources/schemas/template_test.go | 2 +- pkg/schema/collection.go | 2 +- pkg/schema/converter/crd.go | 4 +- pkg/schema/converter/crd_test.go | 4 +- pkg/schema/converter/description_test.go | 2 +- pkg/schema/converter/discovery.go | 4 +- pkg/schema/converter/discovery_test.go | 2 +- pkg/schema/converter/k8stonorman.go | 2 +- pkg/schema/converter/k8stonorman_test.go | 4 +- pkg/schema/definitions/handler.go | 4 +- pkg/schema/definitions/handler_test.go | 2 +- pkg/schema/definitions/schema.go | 6 +-- pkg/schema/definitions/schema_test.go | 2 +- pkg/schema/factory_test.go | 2 +- pkg/schema/table/mapper.go | 6 +-- pkg/server/cli/clicontext.go | 4 +- pkg/server/config.go | 22 +++++----- .../partition/listprocessor/processor.go | 6 +-- .../partition/listprocessor/processor_test.go | 2 +- pkg/stores/partition/store.go | 2 +- pkg/stores/partition/store_test.go | 4 +- pkg/stores/proxy/error_wrapper.go | 2 +- pkg/stores/proxy/proxy_store.go | 8 ++-- pkg/stores/proxy/proxy_store_test.go | 2 +- pkg/stores/proxy/rbac_store.go | 2 +- pkg/stores/proxy/rbac_store_test.go | 2 +- pkg/stores/proxy/unformatter.go | 4 +- .../sqlpartition/listprocessor/processor.go | 2 +- pkg/stores/sqlpartition/partitioner.go | 2 +- pkg/stores/sqlpartition/partitioner_test.go | 2 +- pkg/stores/sqlpartition/store_test.go | 4 +- pkg/stores/sqlproxy/proxy_store.go | 8 ++-- pkg/stores/sqlproxy/proxy_store_test.go | 2 +- .../sqlproxy/tablelistconvert/client.go | 2 +- pkg/summarycache/summarycache.go | 4 +- 57 files changed, 133 insertions(+), 130 deletions(-) diff --git a/README.md b/README.md index c91bcf98..22f275be 100644 --- a/README.md +++ b/README.md @@ -239,7 +239,7 @@ import ( "context" "github.com/rancher/steve/pkg/server" - "github.com/rancher/wrangler/v2/pkg/kubeconfig" + "github.com/rancher/wrangler/v3/pkg/kubeconfig" ) func steve() error { diff --git a/go.mod b/go.mod index 02c495eb..19c94915 100644 --- a/go.mod +++ b/go.mod @@ -24,23 +24,24 @@ require ( github.com/rancher/dynamiclistener v0.5.0-rc6 github.com/rancher/kubernetes-provider-detector v0.1.5 github.com/rancher/lasso v0.0.0-20240603075835-701e919d08b7 - github.com/rancher/norman v0.0.0-20240503193601-9f5f6586bb5b + github.com/rancher/norman v0.0.0-20240604183301-20cd23aadce1 github.com/rancher/remotedialer v0.3.2 github.com/rancher/wrangler/v2 v2.2.0-rc6 + github.com/rancher/wrangler/v3 v3.0.0-rc2 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.9.0 github.com/urfave/cli v1.22.14 github.com/urfave/cli/v2 v2.27.1 golang.org/x/sync v0.7.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.30.0 - k8s.io/apiextensions-apiserver v0.29.3 - k8s.io/apimachinery v0.30.0 - k8s.io/apiserver v0.29.3 - k8s.io/client-go v12.0.0+incompatible + k8s.io/api v0.30.1 + k8s.io/apiextensions-apiserver v0.30.1 + k8s.io/apimachinery v0.30.1 + k8s.io/apiserver v0.30.1 + k8s.io/client-go v0.30.1 k8s.io/klog v1.0.0 - k8s.io/kube-aggregator v0.29.3 - k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 + k8s.io/kube-aggregator v0.30.1 + k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3 ) require ( @@ -108,7 +109,7 @@ require ( google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/component-base v0.29.3 // indirect + k8s.io/component-base v0.30.1 // indirect k8s.io/klog/v2 v2.120.1 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect @@ -118,7 +119,7 @@ require ( modernc.org/sqlite v1.29.10 // indirect modernc.org/strutil v1.2.0 // indirect modernc.org/token v1.1.0 // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect sigs.k8s.io/cli-utils v0.35.0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff --git a/go.sum b/go.sum index 8e3916bb..b2ae4a38 100644 --- a/go.sum +++ b/go.sum @@ -1025,12 +1025,14 @@ github.com/rancher/kubernetes-provider-detector v0.1.5 h1:hWRAsWuJOemzGjz/XrbTlM github.com/rancher/kubernetes-provider-detector v0.1.5/go.mod h1:ypuJS7kP7rUiAn330xG46mj+Nhvym05GM8NqMVekpH0= github.com/rancher/lasso v0.0.0-20240603075835-701e919d08b7 h1:E5AeOkylBXf4APhnHgDvePdtpxOfIjhKnxfjm4sDIEk= github.com/rancher/lasso v0.0.0-20240603075835-701e919d08b7/go.mod h1:v0FJLrmL4m6zdWfIB0/qo7qN5QIjVMFyvFGaw8uyWsA= -github.com/rancher/norman v0.0.0-20240503193601-9f5f6586bb5b h1:9k8VOhRi6ZIZ8rBlQG8ON9eG+ukqThNeXJ2e6CzZO78= -github.com/rancher/norman v0.0.0-20240503193601-9f5f6586bb5b/go.mod h1:xJ0CLJUG9SvtyuPzPA8ATh2SjwiqXGfE+pPh7uVhJzQ= +github.com/rancher/norman v0.0.0-20240604183301-20cd23aadce1 h1:7g0yOiUGfT4zK4N9H0PSijnS/e2YrObi4Gj19JgE1L8= +github.com/rancher/norman v0.0.0-20240604183301-20cd23aadce1/go.mod h1:sGnN5ayvAHLfInOFZ4N1fzZw1IMy3i+9PZA7IxlPsRg= github.com/rancher/remotedialer v0.3.2 h1:kstZbRwPS5gPWpGg8VjEHT2poHtArs+Fc317YM8JCzU= github.com/rancher/remotedialer v0.3.2/go.mod h1:Ys004RpJuTLSm+k4aYUCoFiOOad37ubYev3TkOFg/5w= github.com/rancher/wrangler/v2 v2.2.0-rc6 h1:jMsuOVl7nBuQ5QJqdNkR2yHEf1+rYiyd1gN+mQzIcag= github.com/rancher/wrangler/v2 v2.2.0-rc6/go.mod h1:rFxhBR+PpC1MuJli+JeMpxoGxfV7XdFWtpdLC8s+oWQ= +github.com/rancher/wrangler/v3 v3.0.0-rc2 h1:XGSPPp6GXELqlLvwJp5MsdqyCPu6SCA4UKJ7rQJzE40= +github.com/rancher/wrangler/v3 v3.0.0-rc2/go.mod h1:f54hh7gFkwwbjsieT2b63FowzTU8FvrBonPe//0CIXo= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= @@ -1112,8 +1114,8 @@ go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= -go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= -go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -1876,18 +1878,18 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80= -k8s.io/api v0.30.0 h1:siWhRq7cNjy2iHssOB9SCGNCl2spiF1dO3dABqZ8niA= -k8s.io/api v0.30.0/go.mod h1:OPlaYhoHs8EQ1ql0R/TsUgaRPhpKNxIMrKQfWUp8QSE= -k8s.io/apiextensions-apiserver v0.29.3 h1:9HF+EtZaVpFjStakF4yVufnXGPRppWFEQ87qnO91YeI= -k8s.io/apiextensions-apiserver v0.29.3/go.mod h1:po0XiY5scnpJfFizNGo6puNU6Fq6D70UJY2Cb2KwAVc= +k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY= +k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM= +k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws= +k8s.io/apiextensions-apiserver v0.30.1/go.mod h1:R4GuSrlhgq43oRY9sF2IToFh7PVlF1JjfWdoG3pixk4= k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU= -k8s.io/apimachinery v0.30.0 h1:qxVPsyDM5XS96NIh9Oj6LavoVFYff/Pon9cZeDIkHHA= -k8s.io/apimachinery v0.30.0/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= -k8s.io/apiserver v0.29.3 h1:xR7ELlJ/BZSr2n4CnD3lfA4gzFivh0wwfNfz9L0WZcE= -k8s.io/apiserver v0.29.3/go.mod h1:hrvXlwfRulbMbBgmWRQlFru2b/JySDpmzvQwwk4GUOs= -k8s.io/component-base v0.29.3 h1:Oq9/nddUxlnrCuuR2K/jp6aflVvc0uDvxMzAWxnGzAo= -k8s.io/component-base v0.29.3/go.mod h1:Yuj33XXjuOk2BAaHsIGHhCKZQAgYKhqIxIjIr2UXYio= +k8s.io/apimachinery v0.30.1 h1:ZQStsEfo4n65yAdlGTfP/uSHMQSoYzU/oeEbkmF7P2U= +k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= +k8s.io/apiserver v0.30.1 h1:BEWEe8bzS12nMtDKXzCF5Q5ovp6LjjYkSp8qOPk8LZ8= +k8s.io/apiserver v0.30.1/go.mod h1:i87ZnQ+/PGAmSbD/iEKM68bm1D5reX8fO4Ito4B01mo= +k8s.io/component-base v0.30.1 h1:bvAtlPh1UrdaZL20D9+sWxsJljMi0QZ3Lmw+kmZAaxQ= +k8s.io/component-base v0.30.1/go.mod h1:e/X9kDiOebwlI41AvBHuWdqFriSRrX50CdwA9TFaHLI= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= @@ -1899,12 +1901,12 @@ k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-aggregator v0.29.3 h1:5KvTyFN8sQq2imq8tMAHWEKoE64Zg9WSMaGX78KV6ps= -k8s.io/kube-aggregator v0.29.3/go.mod h1:xGJqV/SJJ1fbwTGfQLAZfwgqX1EMoaqfotDTkDrqqSk= +k8s.io/kube-aggregator v0.30.1 h1:ymR2BsxDacTKwzKTuNhGZttuk009c+oZbSeD+IPX5q4= +k8s.io/kube-aggregator v0.30.1/go.mod h1:SFbqWsM6ea8dHd3mPLsZFzJHbjBOS5ykIgJh4znZ5iQ= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= +k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3 h1:SbdLaI6mM6ffDSJCadEaD4IkuPzepLDGlkd2xV0t1uA= +k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= @@ -1971,8 +1973,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 h1:/U5vjBbQn3RChhv7P11uhYvCSm5G2GaIi5AIGBS6r4c= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0/go.mod h1:z7+wmGM2dfIiLRfrC6jb5kV2Mq/sK1ZP303cxzkV5Y4= sigs.k8s.io/cli-utils v0.35.0 h1:dfSJaF1W0frW74PtjwiyoB4cwdRygbHnC7qe7HF0g/Y= sigs.k8s.io/cli-utils v0.35.0/go.mod h1:ITitykCJxP1vaj1Cew/FZEaVJ2YsTN9Q71m02jebkoE= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/main.go b/main.go index 94459292..36529962 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/v2/pkg/signals" + "github.com/rancher/wrangler/v3/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 7a8b32ad..083978e3 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/v2/pkg/kv" + "github.com/rancher/wrangler/v3/pkg/kv" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/accesscontrol/access_store.go b/pkg/accesscontrol/access_store.go index 95cc3efd..a4ece860 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/v2/pkg/generated/controllers/rbac/v1" + v1 "github.com/rancher/wrangler/v3/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 4ed91dc1..42395088 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/v2/pkg/generated/controllers/rbac/v1" + v1 "github.com/rancher/wrangler/v3/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 09871da6..975cc508 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/v2/pkg/generated/controllers/rbac/v1" - "github.com/rancher/wrangler/v2/pkg/kv" + rbac "github.com/rancher/wrangler/v3/pkg/generated/controllers/rbac/v1" + "github.com/rancher/wrangler/v3/pkg/kv" rbacv1 "k8s.io/api/rbac/v1" ) diff --git a/pkg/aggregation/watch.go b/pkg/aggregation/watch.go index cb311c03..4d508519 100644 --- a/pkg/aggregation/watch.go +++ b/pkg/aggregation/watch.go @@ -5,7 +5,7 @@ import ( "context" "net/http" - v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" + v1 "github.com/rancher/wrangler/v3/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 fdd2419b..3ba8f69c 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/v2/pkg/data/convert" + "github.com/rancher/wrangler/v3/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 3dc982b1..34ffdf1f 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/v2/pkg/merr" - "github.com/rancher/wrangler/v2/pkg/summary/client" - "github.com/rancher/wrangler/v2/pkg/summary/informer" + "github.com/rancher/wrangler/v3/pkg/merr" + "github.com/rancher/wrangler/v3/pkg/summary/client" + "github.com/rancher/wrangler/v3/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 5bcf5d11..0ef75b0b 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/v2/pkg/generated/controllers/apiextensions.k8s.io/v1" - v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiregistration.k8s.io/v1" + apiextcontrollerv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/apiextensions.k8s.io/v1" + v1 "github.com/rancher/wrangler/v3/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 c01da0f4..57a862bf 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/v2/pkg/condition" - "github.com/rancher/wrangler/v2/pkg/randomtoken" - "github.com/rancher/wrangler/v2/pkg/schemas/validation" + "github.com/rancher/wrangler/v3/pkg/condition" + "github.com/rancher/wrangler/v3/pkg/randomtoken" + "github.com/rancher/wrangler/v3/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 9ef1a602..3910af63 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/v2/pkg/apply" - "github.com/rancher/wrangler/v2/pkg/yaml" + "github.com/rancher/wrangler/v3/pkg/apply" + "github.com/rancher/wrangler/v3/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 294771ab..3e80e2e2 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/v2/pkg/genericcondition" - "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v3/pkg/genericcondition" + "github.com/rancher/wrangler/v3/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 5b00f53f..ae4798c8 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/v2/pkg/genericcondition" + "github.com/rancher/wrangler/v3/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 774b2e20..6e8f86ea 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/v2/pkg/ratelimit" + "github.com/rancher/wrangler/v3/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 5ed8ec84..1bda5986 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/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" + "github.com/rancher/wrangler/v3/pkg/data" + corecontrollers "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/v3/pkg/slice" + "github.com/rancher/wrangler/v3/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 d4e7d9d9..78f50e9b 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/v2/pkg/summary" + "github.com/rancher/wrangler/v3/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 d1e705ba..297bb985 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/v2/pkg/schemas" - "github.com/rancher/wrangler/v2/pkg/summary" + "github.com/rancher/wrangler/v3/pkg/schemas" + "github.com/rancher/wrangler/v3/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 40a71c4f..a96e45f7 100644 --- a/pkg/resources/schema.go +++ b/pkg/resources/schema.go @@ -18,7 +18,7 @@ import ( "github.com/rancher/steve/pkg/schema" "github.com/rancher/steve/pkg/stores/proxy" "github.com/rancher/steve/pkg/summarycache" - corecontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" + corecontrollers "github.com/rancher/wrangler/v3/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 b459004a..b506bb38 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/v2/pkg/broadcast" - "github.com/rancher/wrangler/v2/pkg/schemas/validation" + "github.com/rancher/wrangler/v3/pkg/broadcast" + "github.com/rancher/wrangler/v3/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 52d70a83..4a1bb916 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/v2/pkg/schemas" + v1schema "github.com/rancher/wrangler/v3/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 dfb5fa7c..f1fbcedc 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/v2/pkg/name" + "github.com/rancher/wrangler/v3/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 db5e031a..fb6bb1f7 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/v2/pkg/generated/controllers/apiextensions.k8s.io/v1" - "github.com/rancher/wrangler/v2/pkg/schemas" + apiextv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/apiextensions.k8s.io/v1" + "github.com/rancher/wrangler/v3/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/crd_test.go b/pkg/schema/converter/crd_test.go index 52297c8c..4ddf1416 100644 --- a/pkg/schema/converter/crd_test.go +++ b/pkg/schema/converter/crd_test.go @@ -7,8 +7,8 @@ import ( "github.com/golang/mock/gomock" "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/schema/table" - "github.com/rancher/wrangler/v2/pkg/generic/fake" - wranglerSchema "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v3/pkg/generic/fake" + wranglerSchema "github.com/rancher/wrangler/v3/pkg/schemas" "github.com/stretchr/testify/assert" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" ) diff --git a/pkg/schema/converter/description_test.go b/pkg/schema/converter/description_test.go index 62f4cfa8..6b258149 100644 --- a/pkg/schema/converter/description_test.go +++ b/pkg/schema/converter/description_test.go @@ -6,7 +6,7 @@ import ( openapiv2 "github.com/google/gnostic-models/openapiv2" "github.com/rancher/apiserver/pkg/types" - "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v3/pkg/schemas" "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" ) diff --git a/pkg/schema/converter/discovery.go b/pkg/schema/converter/discovery.go index d6e55fd2..f9fb1f5d 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/v2/pkg/merr" - "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v3/pkg/merr" + "github.com/rancher/wrangler/v3/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/discovery_test.go b/pkg/schema/converter/discovery_test.go index b55a2d1d..3bd7d2e9 100644 --- a/pkg/schema/converter/discovery_test.go +++ b/pkg/schema/converter/discovery_test.go @@ -6,7 +6,7 @@ import ( openapiv2 "github.com/google/gnostic-models/openapiv2" "github.com/rancher/apiserver/pkg/types" - wranglerSchema "github.com/rancher/wrangler/v2/pkg/schemas" + wranglerSchema "github.com/rancher/wrangler/v3/pkg/schemas" "github.com/stretchr/testify/assert" 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 6e9097fd..8cbeca85 100644 --- a/pkg/schema/converter/k8stonorman.go +++ b/pkg/schema/converter/k8stonorman.go @@ -8,7 +8,7 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/norman/types/convert" - v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io/v1" + v1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/apiextensions.k8s.io/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/discovery" "k8s.io/kube-openapi/pkg/util/proto" diff --git a/pkg/schema/converter/k8stonorman_test.go b/pkg/schema/converter/k8stonorman_test.go index f739c39f..18313765 100644 --- a/pkg/schema/converter/k8stonorman_test.go +++ b/pkg/schema/converter/k8stonorman_test.go @@ -8,8 +8,8 @@ import ( openapiv2 "github.com/google/gnostic-models/openapiv2" "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/schema/table" - "github.com/rancher/wrangler/v2/pkg/generic/fake" - wranglerSchema "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v3/pkg/generic/fake" + wranglerSchema "github.com/rancher/wrangler/v3/pkg/schemas" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" diff --git a/pkg/schema/definitions/handler.go b/pkg/schema/definitions/handler.go index c0a869f7..bb237248 100644 --- a/pkg/schema/definitions/handler.go +++ b/pkg/schema/definitions/handler.go @@ -8,8 +8,8 @@ import ( "github.com/rancher/apiserver/pkg/apierror" "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/schema/converter" - wranglerDefinition "github.com/rancher/wrangler/v2/pkg/schemas/definition" - "github.com/rancher/wrangler/v2/pkg/schemas/validation" + wranglerDefinition "github.com/rancher/wrangler/v3/pkg/schemas/definition" + "github.com/rancher/wrangler/v3/pkg/schemas/validation" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/discovery" "k8s.io/kube-openapi/pkg/util/proto" diff --git a/pkg/schema/definitions/handler_test.go b/pkg/schema/definitions/handler_test.go index 9adb3693..8bc2972f 100644 --- a/pkg/schema/definitions/handler_test.go +++ b/pkg/schema/definitions/handler_test.go @@ -7,7 +7,7 @@ import ( openapi_v2 "github.com/google/gnostic-models/openapiv2" "github.com/rancher/apiserver/pkg/apierror" "github.com/rancher/apiserver/pkg/types" - wschemas "github.com/rancher/wrangler/v2/pkg/schemas" + wschemas "github.com/rancher/wrangler/v3/pkg/schemas" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/version" diff --git a/pkg/schema/definitions/schema.go b/pkg/schema/definitions/schema.go index a4ee622f..813fdfb0 100644 --- a/pkg/schema/definitions/schema.go +++ b/pkg/schema/definitions/schema.go @@ -8,9 +8,9 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/debounce" - 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/rancher/wrangler/v2/pkg/schemas" + apiextcontrollerv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/apiextensions.k8s.io/v1" + v1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/apiregistration.k8s.io/v1" + "github.com/rancher/wrangler/v3/pkg/schemas" "github.com/sirupsen/logrus" "k8s.io/client-go/discovery" ) diff --git a/pkg/schema/definitions/schema_test.go b/pkg/schema/definitions/schema_test.go index b47d6108..5b859de9 100644 --- a/pkg/schema/definitions/schema_test.go +++ b/pkg/schema/definitions/schema_test.go @@ -8,7 +8,7 @@ import ( "github.com/golang/mock/gomock" "github.com/rancher/apiserver/pkg/types" - "github.com/rancher/wrangler/v2/pkg/generic/fake" + "github.com/rancher/wrangler/v3/pkg/generic/fake" "github.com/stretchr/testify/require" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiregv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" diff --git a/pkg/schema/factory_test.go b/pkg/schema/factory_test.go index 20dc5c0a..44dd0eaa 100644 --- a/pkg/schema/factory_test.go +++ b/pkg/schema/factory_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/rancher/apiserver/pkg/types" - "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v3/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 d4046de5..77f44b90 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/v2/pkg/data" - types "github.com/rancher/wrangler/v2/pkg/schemas" - "github.com/rancher/wrangler/v2/pkg/schemas/mappers" + "github.com/rancher/wrangler/v3/pkg/data" + types "github.com/rancher/wrangler/v3/pkg/schemas" + "github.com/rancher/wrangler/v3/pkg/schemas/mappers" ) type Column struct { diff --git a/pkg/server/cli/clicontext.go b/pkg/server/cli/clicontext.go index ba31446f..56c644d2 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/v2/pkg/kubeconfig" - "github.com/rancher/wrangler/v2/pkg/ratelimit" + "github.com/rancher/wrangler/v3/pkg/kubeconfig" + "github.com/rancher/wrangler/v3/pkg/ratelimit" "github.com/urfave/cli" ) diff --git a/pkg/server/config.go b/pkg/server/config.go index f4acd45e..4d6a36a2 100644 --- a/pkg/server/config.go +++ b/pkg/server/config.go @@ -4,17 +4,17 @@ import ( "context" "time" - "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" + "github.com/rancher/wrangler/v3/pkg/generated/controllers/apiextensions.k8s.io" + apiextensionsv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/apiextensions.k8s.io/v1" + "github.com/rancher/wrangler/v3/pkg/generated/controllers/apiregistration.k8s.io" + apiregistrationv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/apiregistration.k8s.io/v1" + "github.com/rancher/wrangler/v3/pkg/generated/controllers/core" + corev1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/v3/pkg/generated/controllers/rbac" + rbacv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/rbac/v1" + "github.com/rancher/wrangler/v3/pkg/generic" + "github.com/rancher/wrangler/v3/pkg/ratelimit" + "github.com/rancher/wrangler/v3/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 485ff207..5a80ebc4 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/v2/pkg/data" - "github.com/rancher/wrangler/v2/pkg/data/convert" - corecontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/v3/pkg/data" + "github.com/rancher/wrangler/v3/pkg/data/convert" + corecontrollers "github.com/rancher/wrangler/v3/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 b81d4d86..d5e4fe5a 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/v2/pkg/generic" + "github.com/rancher/wrangler/v3/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 b09d8656..85bfe461 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/v2/pkg/generated/controllers/core/v1" + corecontrollers "github.com/rancher/wrangler/v3/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 101c197c..41b464df 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/v2/pkg/generic" - "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v3/pkg/generic" + "github.com/rancher/wrangler/v3/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 deefe45c..4cc54167 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/v2/pkg/schemas/validation" + "github.com/rancher/wrangler/v3/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 90545c45..d998a071 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/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/rancher/wrangler/v3/pkg/data" + corecontrollers "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/v3/pkg/schemas/validation" + "github.com/rancher/wrangler/v3/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 561ddac5..ddfc376d 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/v2/pkg/schemas" + "github.com/rancher/wrangler/v3/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 e76535e0..f7e2294b 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/v2/pkg/kv" + "github.com/rancher/wrangler/v3/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 c60109d1..ee19c9fe 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/v2/pkg/schemas" + "github.com/rancher/wrangler/v3/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 16da0d05..270c9178 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/v2/pkg/data" - "github.com/rancher/wrangler/v2/pkg/data/convert" + "github.com/rancher/wrangler/v3/pkg/data" + "github.com/rancher/wrangler/v3/pkg/data/convert" ) // unformatterStore removes fields added by the formatter that kubernetes cannot recognize. diff --git a/pkg/stores/sqlpartition/listprocessor/processor.go b/pkg/stores/sqlpartition/listprocessor/processor.go index bf7acb31..cae9e4a5 100644 --- a/pkg/stores/sqlpartition/listprocessor/processor.go +++ b/pkg/stores/sqlpartition/listprocessor/processor.go @@ -12,7 +12,7 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/lasso/pkg/cache/sql/informer" "github.com/rancher/lasso/pkg/cache/sql/partition" - "github.com/rancher/wrangler/v2/pkg/schemas/validation" + "github.com/rancher/wrangler/v3/pkg/schemas/validation" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/stores/sqlpartition/partitioner.go b/pkg/stores/sqlpartition/partitioner.go index 5de04340..4679ee5c 100644 --- a/pkg/stores/sqlpartition/partitioner.go +++ b/pkg/stores/sqlpartition/partitioner.go @@ -8,7 +8,7 @@ import ( "github.com/rancher/lasso/pkg/cache/sql/partition" "github.com/rancher/steve/pkg/accesscontrol" "github.com/rancher/steve/pkg/attributes" - "github.com/rancher/wrangler/v2/pkg/kv" + "github.com/rancher/wrangler/v3/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/sqlpartition/partitioner_test.go b/pkg/stores/sqlpartition/partitioner_test.go index 0f1775af..28fad185 100644 --- a/pkg/stores/sqlpartition/partitioner_test.go +++ b/pkg/stores/sqlpartition/partitioner_test.go @@ -8,7 +8,7 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/lasso/pkg/cache/sql/partition" "github.com/rancher/steve/pkg/accesscontrol" - "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v3/pkg/schemas" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/pkg/stores/sqlpartition/store_test.go b/pkg/stores/sqlpartition/store_test.go index 341a579b..f629be5f 100644 --- a/pkg/stores/sqlpartition/store_test.go +++ b/pkg/stores/sqlpartition/store_test.go @@ -11,14 +11,14 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v3/pkg/schemas" "github.com/stretchr/testify/assert" "github.com/rancher/apiserver/pkg/types" "github.com/rancher/lasso/pkg/cache/sql/partition" "github.com/rancher/steve/pkg/accesscontrol" "github.com/rancher/steve/pkg/stores/sqlproxy" - "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v3/pkg/generic" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/stores/sqlproxy/proxy_store.go b/pkg/stores/sqlproxy/proxy_store.go index 9d25d3a3..647ccafa 100644 --- a/pkg/stores/sqlproxy/proxy_store.go +++ b/pkg/stores/sqlproxy/proxy_store.go @@ -25,10 +25,10 @@ import ( metricsStore "github.com/rancher/steve/pkg/stores/metrics" "github.com/rancher/steve/pkg/stores/sqlpartition/listprocessor" "github.com/rancher/steve/pkg/stores/sqlproxy/tablelistconvert" - "github.com/rancher/wrangler/v2/pkg/data" - "github.com/rancher/wrangler/v2/pkg/schemas" - "github.com/rancher/wrangler/v2/pkg/schemas/validation" - "github.com/rancher/wrangler/v2/pkg/summary" + "github.com/rancher/wrangler/v3/pkg/data" + "github.com/rancher/wrangler/v3/pkg/schemas" + "github.com/rancher/wrangler/v3/pkg/schemas/validation" + "github.com/rancher/wrangler/v3/pkg/summary" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/stores/sqlproxy/proxy_store_test.go b/pkg/stores/sqlproxy/proxy_store_test.go index 144892b8..77a6b90e 100644 --- a/pkg/stores/sqlproxy/proxy_store_test.go +++ b/pkg/stores/sqlproxy/proxy_store_test.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/client" - "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v3/pkg/schemas" "github.com/stretchr/testify/assert" "golang.org/x/sync/errgroup" v1 "k8s.io/api/core/v1" diff --git a/pkg/stores/sqlproxy/tablelistconvert/client.go b/pkg/stores/sqlproxy/tablelistconvert/client.go index e76d307e..f4830f9a 100644 --- a/pkg/stores/sqlproxy/tablelistconvert/client.go +++ b/pkg/stores/sqlproxy/tablelistconvert/client.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - "github.com/rancher/wrangler/v2/pkg/data" + "github.com/rancher/wrangler/v3/pkg/data" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" k8sWatch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/summarycache/summarycache.go b/pkg/summarycache/summarycache.go index dfb6845b..90a1055e 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/v2/pkg/slice" - "github.com/rancher/wrangler/v2/pkg/summary" + "github.com/rancher/wrangler/v3/pkg/slice" + "github.com/rancher/wrangler/v3/pkg/summary" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime"