diff --git a/.drone.yml b/.drone.yml index 82ad3229..e648c5f2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ platform: steps: - name: test - image: registry.suse.com/bci/golang:1.19 + image: registry.suse.com/bci/golang:1.20 commands: - go install github.com/golang/mock/mockgen@v1.6.0 - ./scripts/ci @@ -28,7 +28,7 @@ platform: steps: - name: test - image: registry.suse.com/bci/golang:1.19 + image: registry.suse.com/bci/golang:1.20 commands: - go install github.com/golang/mock/mockgen@v1.6.0 - ./scripts/ci diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 85ebcff9..abf1334e 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,7 +1,7 @@ name: golangci-lint env: - SETUP_GO_VERSION: '^1.19' + SETUP_GO_VERSION: '^1.20' on: push: diff --git a/README.md b/README.md index 760625fd..e90cfb5b 100644 --- a/README.md +++ b/README.md @@ -222,7 +222,7 @@ import ( "context" "github.com/rancher/rancher/pkg/generated/controllers/management.cattle.io" - "github.com/rancher/wrangler/pkg/generated/controllers/core" + "github.com/rancher/wrangler/v2/pkg/generated/controllers/core" "k8s.io/client-go/rest" ) diff --git a/go.mod b/go.mod index 05b1003b..902f112e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/rancher/wrangler +module github.com/rancher/wrangler/v2 -go 1.19 +go 1.20 require ( github.com/evanphx/json-patch v5.6.0+incompatible diff --git a/pkg/apply/apply.go b/pkg/apply/apply.go index 094ca1bb..d8cfdaca 100644 --- a/pkg/apply/apply.go +++ b/pkg/apply/apply.go @@ -5,8 +5,8 @@ import ( "fmt" "sync" - "github.com/rancher/wrangler/pkg/apply/injectors" - "github.com/rancher/wrangler/pkg/objectset" + "github.com/rancher/wrangler/v2/pkg/apply/injectors" + "github.com/rancher/wrangler/v2/pkg/objectset" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/apply/desiredset.go b/pkg/apply/desiredset.go index 054d058c..8014ff0e 100644 --- a/pkg/apply/desiredset.go +++ b/pkg/apply/desiredset.go @@ -3,10 +3,10 @@ package apply import ( "context" - "github.com/rancher/wrangler/pkg/apply/injectors" - "github.com/rancher/wrangler/pkg/kv" - "github.com/rancher/wrangler/pkg/merr" - "github.com/rancher/wrangler/pkg/objectset" + "github.com/rancher/wrangler/v2/pkg/apply/injectors" + "github.com/rancher/wrangler/v2/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/merr" + "github.com/rancher/wrangler/v2/pkg/objectset" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/apply/desiredset_apply.go b/pkg/apply/desiredset_apply.go index cf4ee232..87dbcf77 100644 --- a/pkg/apply/desiredset_apply.go +++ b/pkg/apply/desiredset_apply.go @@ -9,11 +9,11 @@ import ( "github.com/sirupsen/logrus" - gvk2 "github.com/rancher/wrangler/pkg/gvk" + gvk2 "github.com/rancher/wrangler/v2/pkg/gvk" "github.com/pkg/errors" - "github.com/rancher/wrangler/pkg/apply/injectors" - "github.com/rancher/wrangler/pkg/objectset" + "github.com/rancher/wrangler/v2/pkg/apply/injectors" + "github.com/rancher/wrangler/v2/pkg/objectset" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/apply/desiredset_compare.go b/pkg/apply/desiredset_compare.go index 15abe6dc..f6f3c3cd 100644 --- a/pkg/apply/desiredset_compare.go +++ b/pkg/apply/desiredset_compare.go @@ -9,10 +9,10 @@ import ( jsonpatch "github.com/evanphx/json-patch" "github.com/pkg/errors" - data2 "github.com/rancher/wrangler/pkg/data" - "github.com/rancher/wrangler/pkg/data/convert" - "github.com/rancher/wrangler/pkg/objectset" - patch2 "github.com/rancher/wrangler/pkg/patch" + data2 "github.com/rancher/wrangler/v2/pkg/data" + "github.com/rancher/wrangler/v2/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/objectset" + patch2 "github.com/rancher/wrangler/v2/pkg/patch" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/api/meta" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apply/desiredset_owner.go b/pkg/apply/desiredset_owner.go index dbe87dad..7fd365cb 100644 --- a/pkg/apply/desiredset_owner.go +++ b/pkg/apply/desiredset_owner.go @@ -4,12 +4,12 @@ import ( "fmt" "strings" - "github.com/rancher/wrangler/pkg/gvk" + "github.com/rancher/wrangler/v2/pkg/gvk" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/kv" "github.com/pkg/errors" - namer "github.com/rancher/wrangler/pkg/name" + namer "github.com/rancher/wrangler/v2/pkg/name" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apply/desiredset_process.go b/pkg/apply/desiredset_process.go index e24c8d59..b26cbf9a 100644 --- a/pkg/apply/desiredset_process.go +++ b/pkg/apply/desiredset_process.go @@ -7,9 +7,9 @@ import ( "sync" "github.com/pkg/errors" - gvk2 "github.com/rancher/wrangler/pkg/gvk" - "github.com/rancher/wrangler/pkg/merr" - "github.com/rancher/wrangler/pkg/objectset" + gvk2 "github.com/rancher/wrangler/v2/pkg/gvk" + "github.com/rancher/wrangler/v2/pkg/merr" + "github.com/rancher/wrangler/v2/pkg/objectset" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" errors2 "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/apply/fake/apply.go b/pkg/apply/fake/apply.go index 019ce6ae..70d46996 100644 --- a/pkg/apply/fake/apply.go +++ b/pkg/apply/fake/apply.go @@ -3,9 +3,9 @@ package fake import ( "context" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/apply/injectors" - "github.com/rancher/wrangler/pkg/objectset" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/apply/injectors" + "github.com/rancher/wrangler/v2/pkg/objectset" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/clients/clients.go b/pkg/clients/clients.go index 38a448b4..ce4a970e 100644 --- a/pkg/clients/clients.go +++ b/pkg/clients/clients.go @@ -6,23 +6,23 @@ import ( "github.com/rancher/lasso/pkg/controller" "github.com/rancher/lasso/pkg/dynamic" - "github.com/rancher/wrangler/pkg/apply" - admissionreg "github.com/rancher/wrangler/pkg/generated/controllers/admissionregistration.k8s.io" - admissionregcontrollers "github.com/rancher/wrangler/pkg/generated/controllers/admissionregistration.k8s.io/v1" - "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io" - crdcontrollers "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1" - "github.com/rancher/wrangler/pkg/generated/controllers/apiregistration.k8s.io" - apicontrollers "github.com/rancher/wrangler/pkg/generated/controllers/apiregistration.k8s.io/v1" - "github.com/rancher/wrangler/pkg/generated/controllers/apps" - appcontrollers "github.com/rancher/wrangler/pkg/generated/controllers/apps/v1" - "github.com/rancher/wrangler/pkg/generated/controllers/batch" - batchcontrollers "github.com/rancher/wrangler/pkg/generated/controllers/batch/v1" - "github.com/rancher/wrangler/pkg/generated/controllers/core" - corecontrollers "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" - "github.com/rancher/wrangler/pkg/generated/controllers/rbac" - rbaccontrollers "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/v2/pkg/apply" + admissionreg "github.com/rancher/wrangler/v2/pkg/generated/controllers/admissionregistration.k8s.io" + admissionregcontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/admissionregistration.k8s.io/v1" + "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io" + crdcontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io/v1" + "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiregistration.k8s.io" + apicontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiregistration.k8s.io/v1" + "github.com/rancher/wrangler/v2/pkg/generated/controllers/apps" + appcontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/apps/v1" + "github.com/rancher/wrangler/v2/pkg/generated/controllers/batch" + batchcontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/batch/v1" + "github.com/rancher/wrangler/v2/pkg/generated/controllers/core" + corecontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac" + rbaccontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac/v1" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/ratelimit" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/client-go/discovery" "k8s.io/client-go/discovery/cached/memory" diff --git a/pkg/codegen/main.go b/pkg/codegen/main.go index 0bebe503..deb2ad28 100644 --- a/pkg/codegen/main.go +++ b/pkg/codegen/main.go @@ -1,8 +1,8 @@ package main import ( - controllergen "github.com/rancher/wrangler/pkg/controller-gen" - "github.com/rancher/wrangler/pkg/controller-gen/args" + controllergen "github.com/rancher/wrangler/v2/pkg/controller-gen" + "github.com/rancher/wrangler/v2/pkg/controller-gen/args" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" @@ -19,6 +19,7 @@ import ( func main() { controllergen.Run(args.Options{ + ImportPackage: "github.com/rancher/wrangler/v2/pkg/generated", OutputPackage: "github.com/rancher/wrangler/pkg/generated", Boilerplate: "scripts/boilerplate.go.txt", Groups: map[string]args.Group{ diff --git a/pkg/condition/condition.go b/pkg/condition/condition.go index ace8dea3..ef8f0e0c 100644 --- a/pkg/condition/condition.go +++ b/pkg/condition/condition.go @@ -4,7 +4,7 @@ import ( "reflect" "time" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "github.com/sirupsen/logrus" ) diff --git a/pkg/controller-gen/args/args.go b/pkg/controller-gen/args/args.go index 95e5db69..fb4c5db9 100644 --- a/pkg/controller-gen/args/args.go +++ b/pkg/controller-gen/args/args.go @@ -6,13 +6,17 @@ import ( ) type CustomArgs struct { - Package string - TypesByGroup map[schema.GroupVersion][]*types.Name - Options Options - OutputBase string + // Package is the directory path where generated code output will be located + Package string + ImportPackage string + TypesByGroup map[schema.GroupVersion][]*types.Name + Options Options + OutputBase string } type Options struct { + ImportPackage string + // OutputPackage is the directory path where generated code output will be located OutputPackage string Groups map[string]Group Boilerplate string diff --git a/pkg/controller-gen/generators/client_generator.go b/pkg/controller-gen/generators/client_generator.go index 318bd421..2e4e717b 100644 --- a/pkg/controller-gen/generators/client_generator.go +++ b/pkg/controller-gen/generators/client_generator.go @@ -21,7 +21,7 @@ import ( "path/filepath" "strings" - args2 "github.com/rancher/wrangler/pkg/controller-gen/args" + args2 "github.com/rancher/wrangler/v2/pkg/controller-gen/args" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/gengo/args" "k8s.io/gengo/generator" diff --git a/pkg/controller-gen/generators/factory_go.go b/pkg/controller-gen/generators/factory_go.go index f11863fb..a5e814cc 100644 --- a/pkg/controller-gen/generators/factory_go.go +++ b/pkg/controller-gen/generators/factory_go.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - args2 "github.com/rancher/wrangler/pkg/controller-gen/args" + args2 "github.com/rancher/wrangler/v2/pkg/controller-gen/args" "k8s.io/gengo/args" "k8s.io/gengo/generator" ) diff --git a/pkg/controller-gen/generators/group_interface_go.go b/pkg/controller-gen/generators/group_interface_go.go index d682796c..df33cac9 100644 --- a/pkg/controller-gen/generators/group_interface_go.go +++ b/pkg/controller-gen/generators/group_interface_go.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - args2 "github.com/rancher/wrangler/pkg/controller-gen/args" + args2 "github.com/rancher/wrangler/v2/pkg/controller-gen/args" "k8s.io/gengo/args" "k8s.io/gengo/generator" "k8s.io/gengo/namer" @@ -37,7 +37,11 @@ func (f *interfaceGo) Imports(context *generator.Context) []string { if gv.Group != f.group { continue } - packages = append(packages, fmt.Sprintf("%s \"%s/controllers/%s/%s\"", gv.Version, f.customArgs.Package, + pkg := f.customArgs.ImportPackage + if pkg == "" { + pkg = f.customArgs.Package + } + packages = append(packages, fmt.Sprintf("%s \"%s/controllers/%s/%s\"", gv.Version, pkg, groupPackageName(gv.Group, f.customArgs.Options.Groups[gv.Group].OutputControllerPackageName), gv.Version)) } diff --git a/pkg/controller-gen/generators/group_version_interface_go.go b/pkg/controller-gen/generators/group_version_interface_go.go index 9c66c2aa..ee3900ff 100644 --- a/pkg/controller-gen/generators/group_version_interface_go.go +++ b/pkg/controller-gen/generators/group_version_interface_go.go @@ -5,7 +5,7 @@ import ( "io" "strings" - args2 "github.com/rancher/wrangler/pkg/controller-gen/args" + args2 "github.com/rancher/wrangler/v2/pkg/controller-gen/args" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/gengo/args" "k8s.io/gengo/generator" diff --git a/pkg/controller-gen/generators/list_type_go.go b/pkg/controller-gen/generators/list_type_go.go index dbef39e5..7585ea6d 100644 --- a/pkg/controller-gen/generators/list_type_go.go +++ b/pkg/controller-gen/generators/list_type_go.go @@ -3,7 +3,7 @@ package generators import ( "io" - args2 "github.com/rancher/wrangler/pkg/controller-gen/args" + args2 "github.com/rancher/wrangler/v2/pkg/controller-gen/args" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/gengo/args" "k8s.io/gengo/generator" diff --git a/pkg/controller-gen/generators/register_group_go.go b/pkg/controller-gen/generators/register_group_go.go index 89165fa3..cb516962 100644 --- a/pkg/controller-gen/generators/register_group_go.go +++ b/pkg/controller-gen/generators/register_group_go.go @@ -3,7 +3,7 @@ package generators import ( "fmt" - args2 "github.com/rancher/wrangler/pkg/controller-gen/args" + args2 "github.com/rancher/wrangler/v2/pkg/controller-gen/args" "k8s.io/gengo/args" "k8s.io/gengo/generator" ) diff --git a/pkg/controller-gen/generators/register_group_version_go.go b/pkg/controller-gen/generators/register_group_version_go.go index cfd7b42e..a83e3f71 100644 --- a/pkg/controller-gen/generators/register_group_version_go.go +++ b/pkg/controller-gen/generators/register_group_version_go.go @@ -5,8 +5,8 @@ import ( "io" "strings" - args2 "github.com/rancher/wrangler/pkg/controller-gen/args" - "github.com/rancher/wrangler/pkg/name" + args2 "github.com/rancher/wrangler/v2/pkg/controller-gen/args" + "github.com/rancher/wrangler/v2/pkg/name" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/gengo/args" "k8s.io/gengo/generator" diff --git a/pkg/controller-gen/generators/type_go.go b/pkg/controller-gen/generators/type_go.go index 3e833a10..2fa46160 100644 --- a/pkg/controller-gen/generators/type_go.go +++ b/pkg/controller-gen/generators/type_go.go @@ -5,7 +5,7 @@ import ( "io" "strings" - args2 "github.com/rancher/wrangler/pkg/controller-gen/args" + args2 "github.com/rancher/wrangler/v2/pkg/controller-gen/args" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/gengo/args" "k8s.io/gengo/generator" diff --git a/pkg/controller-gen/generators/util.go b/pkg/controller-gen/generators/util.go index f5c7193c..b86714a6 100644 --- a/pkg/controller-gen/generators/util.go +++ b/pkg/controller-gen/generators/util.go @@ -13,12 +13,12 @@ var ( "context", "time", "k8s.io/client-go/rest", - "github.com/rancher/wrangler/pkg/apply", + "github.com/rancher/wrangler/v2/pkg/apply", "github.com/rancher/lasso/pkg/controller", - "github.com/rancher/wrangler/pkg/condition", - "github.com/rancher/wrangler/pkg/schemes", - "github.com/rancher/wrangler/pkg/generic", - "github.com/rancher/wrangler/pkg/kv", + "github.com/rancher/wrangler/v2/pkg/condition", + "github.com/rancher/wrangler/v2/pkg/schemes", + "github.com/rancher/wrangler/v2/pkg/generic", + "github.com/rancher/wrangler/v2/pkg/kv", "k8s.io/apimachinery/pkg/api/equality", "k8s.io/apimachinery/pkg/api/errors", "metav1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"", diff --git a/pkg/controller-gen/main.go b/pkg/controller-gen/main.go index 5cd2d4c9..6aeb3d91 100644 --- a/pkg/controller-gen/main.go +++ b/pkg/controller-gen/main.go @@ -10,8 +10,8 @@ import ( "k8s.io/gengo/generator" - cgargs "github.com/rancher/wrangler/pkg/controller-gen/args" - "github.com/rancher/wrangler/pkg/controller-gen/generators" + cgargs "github.com/rancher/wrangler/v2/pkg/controller-gen/args" + "github.com/rancher/wrangler/v2/pkg/controller-gen/generators" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/runtime/schema" csargs "k8s.io/code-generator/cmd/client-gen/args" @@ -30,11 +30,11 @@ import ( func Run(opts cgargs.Options) { customArgs := &cgargs.CustomArgs{ - Options: opts, - TypesByGroup: map[schema.GroupVersion][]*types.Name{}, - Package: opts.OutputPackage, + ImportPackage: opts.ImportPackage, + Options: opts, + TypesByGroup: map[schema.GroupVersion][]*types.Name{}, + Package: opts.OutputPackage, } - genericArgs := args.Default().WithoutDefaultFlagParsing() genericArgs.CustomArgs = customArgs genericArgs.GoHeaderFilePath = opts.Boilerplate diff --git a/pkg/crd/init.go b/pkg/crd/init.go index 873907e8..97463a7e 100644 --- a/pkg/crd/init.go +++ b/pkg/crd/init.go @@ -10,11 +10,11 @@ import ( "sync" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/data/convert" - "github.com/rancher/wrangler/pkg/kv" - "github.com/rancher/wrangler/pkg/name" - "github.com/rancher/wrangler/pkg/schemas/openapi" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/name" + "github.com/rancher/wrangler/v2/pkg/schemas/openapi" "github.com/sirupsen/logrus" apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/rest" // Ensure the gvks are loaded so that apply works correctly - _ "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1" + _ "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io/v1" ) const CRDKind = "CustomResourceDefinition" diff --git a/pkg/crd/print.go b/pkg/crd/print.go index adee2d12..d809a09c 100644 --- a/pkg/crd/print.go +++ b/pkg/crd/print.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/rancher/wrangler/pkg/yaml" + "github.com/rancher/wrangler/v2/pkg/yaml" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/rest" ) diff --git a/pkg/data/data.go b/pkg/data/data.go index 46a3ccb7..08f13870 100644 --- a/pkg/data/data.go +++ b/pkg/data/data.go @@ -1,7 +1,7 @@ package data import ( - "github.com/rancher/wrangler/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/data/convert" ) type List []map[string]interface{} diff --git a/pkg/generated/controllers/admissionregistration.k8s.io/factory.go b/pkg/generated/controllers/admissionregistration.k8s.io/factory.go index ed2b446d..ec452c3c 100644 --- a/pkg/generated/controllers/admissionregistration.k8s.io/factory.go +++ b/pkg/generated/controllers/admissionregistration.k8s.io/factory.go @@ -20,7 +20,7 @@ package admissionregistration import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "k8s.io/client-go/rest" ) diff --git a/pkg/generated/controllers/admissionregistration.k8s.io/interface.go b/pkg/generated/controllers/admissionregistration.k8s.io/interface.go index 9f444b8b..63510a5b 100644 --- a/pkg/generated/controllers/admissionregistration.k8s.io/interface.go +++ b/pkg/generated/controllers/admissionregistration.k8s.io/interface.go @@ -20,7 +20,7 @@ package admissionregistration import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/admissionregistration.k8s.io/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/admissionregistration.k8s.io/v1" ) type Interface interface { diff --git a/pkg/generated/controllers/admissionregistration.k8s.io/v1/interface.go b/pkg/generated/controllers/admissionregistration.k8s.io/v1/interface.go index f2162f18..79c33cff 100644 --- a/pkg/generated/controllers/admissionregistration.k8s.io/v1/interface.go +++ b/pkg/generated/controllers/admissionregistration.k8s.io/v1/interface.go @@ -20,8 +20,8 @@ package v1 import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemes" v1 "k8s.io/api/admissionregistration/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/generated/controllers/admissionregistration.k8s.io/v1/mutatingwebhookconfiguration.go b/pkg/generated/controllers/admissionregistration.k8s.io/v1/mutatingwebhookconfiguration.go index c086c132..14979f78 100644 --- a/pkg/generated/controllers/admissionregistration.k8s.io/v1/mutatingwebhookconfiguration.go +++ b/pkg/generated/controllers/admissionregistration.k8s.io/v1/mutatingwebhookconfiguration.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/admissionregistration/v1" ) diff --git a/pkg/generated/controllers/admissionregistration.k8s.io/v1/validatingwebhookconfiguration.go b/pkg/generated/controllers/admissionregistration.k8s.io/v1/validatingwebhookconfiguration.go index c2e7d61c..df5afc45 100644 --- a/pkg/generated/controllers/admissionregistration.k8s.io/v1/validatingwebhookconfiguration.go +++ b/pkg/generated/controllers/admissionregistration.k8s.io/v1/validatingwebhookconfiguration.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/admissionregistration/v1" ) diff --git a/pkg/generated/controllers/apiextensions.k8s.io/factory.go b/pkg/generated/controllers/apiextensions.k8s.io/factory.go index d8f02696..e4cd6965 100644 --- a/pkg/generated/controllers/apiextensions.k8s.io/factory.go +++ b/pkg/generated/controllers/apiextensions.k8s.io/factory.go @@ -20,7 +20,7 @@ package apiextensions import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "k8s.io/client-go/rest" ) diff --git a/pkg/generated/controllers/apiextensions.k8s.io/interface.go b/pkg/generated/controllers/apiextensions.k8s.io/interface.go index b3e08655..65cfe78f 100644 --- a/pkg/generated/controllers/apiextensions.k8s.io/interface.go +++ b/pkg/generated/controllers/apiextensions.k8s.io/interface.go @@ -20,7 +20,7 @@ package apiextensions import ( "github.com/rancher/lasso/pkg/controller" - 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" ) type Interface interface { diff --git a/pkg/generated/controllers/apiextensions.k8s.io/v1/customresourcedefinition.go b/pkg/generated/controllers/apiextensions.k8s.io/v1/customresourcedefinition.go index 646829bb..0151e64b 100644 --- a/pkg/generated/controllers/apiextensions.k8s.io/v1/customresourcedefinition.go +++ b/pkg/generated/controllers/apiextensions.k8s.io/v1/customresourcedefinition.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generated/controllers/apiextensions.k8s.io/v1/interface.go b/pkg/generated/controllers/apiextensions.k8s.io/v1/interface.go index 7db10d7a..88cd729b 100644 --- a/pkg/generated/controllers/apiextensions.k8s.io/v1/interface.go +++ b/pkg/generated/controllers/apiextensions.k8s.io/v1/interface.go @@ -20,8 +20,8 @@ package v1 import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemes" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/generated/controllers/apiregistration.k8s.io/factory.go b/pkg/generated/controllers/apiregistration.k8s.io/factory.go index 33ec8756..5d849d42 100644 --- a/pkg/generated/controllers/apiregistration.k8s.io/factory.go +++ b/pkg/generated/controllers/apiregistration.k8s.io/factory.go @@ -20,7 +20,7 @@ package apiregistration import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "k8s.io/client-go/rest" ) diff --git a/pkg/generated/controllers/apiregistration.k8s.io/interface.go b/pkg/generated/controllers/apiregistration.k8s.io/interface.go index 147658a4..8a4409d8 100644 --- a/pkg/generated/controllers/apiregistration.k8s.io/interface.go +++ b/pkg/generated/controllers/apiregistration.k8s.io/interface.go @@ -20,7 +20,7 @@ package apiregistration import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/apiregistration.k8s.io/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiregistration.k8s.io/v1" ) type Interface interface { diff --git a/pkg/generated/controllers/apiregistration.k8s.io/v1/apiservice.go b/pkg/generated/controllers/apiregistration.k8s.io/v1/apiservice.go index b462f63d..2f1dc2d1 100644 --- a/pkg/generated/controllers/apiregistration.k8s.io/v1/apiservice.go +++ b/pkg/generated/controllers/apiregistration.k8s.io/v1/apiservice.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/generated/controllers/apiregistration.k8s.io/v1/interface.go b/pkg/generated/controllers/apiregistration.k8s.io/v1/interface.go index 398bd811..89e751a2 100644 --- a/pkg/generated/controllers/apiregistration.k8s.io/v1/interface.go +++ b/pkg/generated/controllers/apiregistration.k8s.io/v1/interface.go @@ -20,8 +20,8 @@ package v1 import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemes" "k8s.io/apimachinery/pkg/runtime/schema" v1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" ) diff --git a/pkg/generated/controllers/apps/factory.go b/pkg/generated/controllers/apps/factory.go index bcaae256..c0d1a3f7 100644 --- a/pkg/generated/controllers/apps/factory.go +++ b/pkg/generated/controllers/apps/factory.go @@ -20,7 +20,7 @@ package apps import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "k8s.io/client-go/rest" ) diff --git a/pkg/generated/controllers/apps/interface.go b/pkg/generated/controllers/apps/interface.go index 4f91f157..7c4f171e 100644 --- a/pkg/generated/controllers/apps/interface.go +++ b/pkg/generated/controllers/apps/interface.go @@ -20,7 +20,7 @@ package apps import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/apps/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apps/v1" ) type Interface interface { diff --git a/pkg/generated/controllers/apps/v1/daemonset.go b/pkg/generated/controllers/apps/v1/daemonset.go index 81dc9926..367e82a7 100644 --- a/pkg/generated/controllers/apps/v1/daemonset.go +++ b/pkg/generated/controllers/apps/v1/daemonset.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" v1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generated/controllers/apps/v1/deployment.go b/pkg/generated/controllers/apps/v1/deployment.go index 27daa00d..9a3ec868 100644 --- a/pkg/generated/controllers/apps/v1/deployment.go +++ b/pkg/generated/controllers/apps/v1/deployment.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" v1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generated/controllers/apps/v1/interface.go b/pkg/generated/controllers/apps/v1/interface.go index 0968f1b1..2c112f70 100644 --- a/pkg/generated/controllers/apps/v1/interface.go +++ b/pkg/generated/controllers/apps/v1/interface.go @@ -20,8 +20,8 @@ package v1 import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemes" v1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/generated/controllers/apps/v1/statefulset.go b/pkg/generated/controllers/apps/v1/statefulset.go index 58b827fa..84387932 100644 --- a/pkg/generated/controllers/apps/v1/statefulset.go +++ b/pkg/generated/controllers/apps/v1/statefulset.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" v1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generated/controllers/batch/factory.go b/pkg/generated/controllers/batch/factory.go index 0a282f17..1bf790b3 100644 --- a/pkg/generated/controllers/batch/factory.go +++ b/pkg/generated/controllers/batch/factory.go @@ -20,7 +20,7 @@ package batch import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "k8s.io/client-go/rest" ) diff --git a/pkg/generated/controllers/batch/interface.go b/pkg/generated/controllers/batch/interface.go index a078bf8e..7d90245c 100644 --- a/pkg/generated/controllers/batch/interface.go +++ b/pkg/generated/controllers/batch/interface.go @@ -20,7 +20,7 @@ package batch import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/batch/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/batch/v1" ) type Interface interface { diff --git a/pkg/generated/controllers/batch/v1/interface.go b/pkg/generated/controllers/batch/v1/interface.go index 1b1c359a..8da95dd6 100644 --- a/pkg/generated/controllers/batch/v1/interface.go +++ b/pkg/generated/controllers/batch/v1/interface.go @@ -20,8 +20,8 @@ package v1 import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemes" v1 "k8s.io/api/batch/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/generated/controllers/batch/v1/job.go b/pkg/generated/controllers/batch/v1/job.go index abfde6e1..4b159753 100644 --- a/pkg/generated/controllers/batch/v1/job.go +++ b/pkg/generated/controllers/batch/v1/job.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" v1 "k8s.io/api/batch/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generated/controllers/coordination.k8s.io/factory.go b/pkg/generated/controllers/coordination.k8s.io/factory.go index 5fd94d93..8141abec 100644 --- a/pkg/generated/controllers/coordination.k8s.io/factory.go +++ b/pkg/generated/controllers/coordination.k8s.io/factory.go @@ -20,7 +20,7 @@ package coordination import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "k8s.io/client-go/rest" ) diff --git a/pkg/generated/controllers/coordination.k8s.io/interface.go b/pkg/generated/controllers/coordination.k8s.io/interface.go index c0cb795b..2db6cd21 100644 --- a/pkg/generated/controllers/coordination.k8s.io/interface.go +++ b/pkg/generated/controllers/coordination.k8s.io/interface.go @@ -20,7 +20,7 @@ package coordination import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/coordination.k8s.io/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/coordination.k8s.io/v1" ) type Interface interface { diff --git a/pkg/generated/controllers/coordination.k8s.io/v1/interface.go b/pkg/generated/controllers/coordination.k8s.io/v1/interface.go index 060d9f10..d8ece7b6 100644 --- a/pkg/generated/controllers/coordination.k8s.io/v1/interface.go +++ b/pkg/generated/controllers/coordination.k8s.io/v1/interface.go @@ -20,8 +20,8 @@ package v1 import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemes" v1 "k8s.io/api/coordination/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/generated/controllers/coordination.k8s.io/v1/lease.go b/pkg/generated/controllers/coordination.k8s.io/v1/lease.go index ef5f6bbc..cdf7b388 100644 --- a/pkg/generated/controllers/coordination.k8s.io/v1/lease.go +++ b/pkg/generated/controllers/coordination.k8s.io/v1/lease.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/coordination/v1" ) diff --git a/pkg/generated/controllers/core/factory.go b/pkg/generated/controllers/core/factory.go index b19523b1..03b8f82a 100644 --- a/pkg/generated/controllers/core/factory.go +++ b/pkg/generated/controllers/core/factory.go @@ -20,7 +20,7 @@ package core import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "k8s.io/client-go/rest" ) diff --git a/pkg/generated/controllers/core/interface.go b/pkg/generated/controllers/core/interface.go index 689915f1..e2f91fc8 100644 --- a/pkg/generated/controllers/core/interface.go +++ b/pkg/generated/controllers/core/interface.go @@ -20,7 +20,7 @@ package core import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" ) type Interface interface { diff --git a/pkg/generated/controllers/core/v1/configmap.go b/pkg/generated/controllers/core/v1/configmap.go index b5b7bdff..96477ebf 100644 --- a/pkg/generated/controllers/core/v1/configmap.go +++ b/pkg/generated/controllers/core/v1/configmap.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/generated/controllers/core/v1/endpoints.go b/pkg/generated/controllers/core/v1/endpoints.go index a6d0c145..925d5864 100644 --- a/pkg/generated/controllers/core/v1/endpoints.go +++ b/pkg/generated/controllers/core/v1/endpoints.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/generated/controllers/core/v1/event.go b/pkg/generated/controllers/core/v1/event.go index f307ce33..772eb7e2 100644 --- a/pkg/generated/controllers/core/v1/event.go +++ b/pkg/generated/controllers/core/v1/event.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/generated/controllers/core/v1/interface.go b/pkg/generated/controllers/core/v1/interface.go index c0923e6a..056e7711 100644 --- a/pkg/generated/controllers/core/v1/interface.go +++ b/pkg/generated/controllers/core/v1/interface.go @@ -20,8 +20,8 @@ package v1 import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemes" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/generated/controllers/core/v1/namespace.go b/pkg/generated/controllers/core/v1/namespace.go index 7ea3d7d5..8386de96 100644 --- a/pkg/generated/controllers/core/v1/namespace.go +++ b/pkg/generated/controllers/core/v1/namespace.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generated/controllers/core/v1/node.go b/pkg/generated/controllers/core/v1/node.go index 03508ad7..ea3e2b9b 100644 --- a/pkg/generated/controllers/core/v1/node.go +++ b/pkg/generated/controllers/core/v1/node.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generated/controllers/core/v1/persistentvolume.go b/pkg/generated/controllers/core/v1/persistentvolume.go index 13db2a56..888c8fdc 100644 --- a/pkg/generated/controllers/core/v1/persistentvolume.go +++ b/pkg/generated/controllers/core/v1/persistentvolume.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generated/controllers/core/v1/persistentvolumeclaim.go b/pkg/generated/controllers/core/v1/persistentvolumeclaim.go index 9b9abfff..7b74ba37 100644 --- a/pkg/generated/controllers/core/v1/persistentvolumeclaim.go +++ b/pkg/generated/controllers/core/v1/persistentvolumeclaim.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generated/controllers/core/v1/pod.go b/pkg/generated/controllers/core/v1/pod.go index 13989f81..748eeab3 100644 --- a/pkg/generated/controllers/core/v1/pod.go +++ b/pkg/generated/controllers/core/v1/pod.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generated/controllers/core/v1/secret.go b/pkg/generated/controllers/core/v1/secret.go index c65c18b5..ac8ed8d4 100644 --- a/pkg/generated/controllers/core/v1/secret.go +++ b/pkg/generated/controllers/core/v1/secret.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/generated/controllers/core/v1/service.go b/pkg/generated/controllers/core/v1/service.go index 7f4105c6..2af69961 100644 --- a/pkg/generated/controllers/core/v1/service.go +++ b/pkg/generated/controllers/core/v1/service.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generated/controllers/core/v1/serviceaccount.go b/pkg/generated/controllers/core/v1/serviceaccount.go index cd3a132b..fec6314b 100644 --- a/pkg/generated/controllers/core/v1/serviceaccount.go +++ b/pkg/generated/controllers/core/v1/serviceaccount.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/generated/controllers/discovery/factory.go b/pkg/generated/controllers/discovery/factory.go index 7b259c2e..62997715 100644 --- a/pkg/generated/controllers/discovery/factory.go +++ b/pkg/generated/controllers/discovery/factory.go @@ -20,7 +20,7 @@ package discovery import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "k8s.io/client-go/rest" ) diff --git a/pkg/generated/controllers/discovery/interface.go b/pkg/generated/controllers/discovery/interface.go index 1eee11be..bb41dc08 100644 --- a/pkg/generated/controllers/discovery/interface.go +++ b/pkg/generated/controllers/discovery/interface.go @@ -20,7 +20,7 @@ package discovery import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/discovery/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/discovery/v1" ) type Interface interface { diff --git a/pkg/generated/controllers/discovery/v1/endpointslice.go b/pkg/generated/controllers/discovery/v1/endpointslice.go index f44400d5..84610cdd 100644 --- a/pkg/generated/controllers/discovery/v1/endpointslice.go +++ b/pkg/generated/controllers/discovery/v1/endpointslice.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/discovery/v1" ) diff --git a/pkg/generated/controllers/discovery/v1/interface.go b/pkg/generated/controllers/discovery/v1/interface.go index 82f6d6cc..b44644d6 100644 --- a/pkg/generated/controllers/discovery/v1/interface.go +++ b/pkg/generated/controllers/discovery/v1/interface.go @@ -20,8 +20,8 @@ package v1 import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemes" v1 "k8s.io/api/discovery/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/generated/controllers/extensions/factory.go b/pkg/generated/controllers/extensions/factory.go index 2c0cdf57..cbb03762 100644 --- a/pkg/generated/controllers/extensions/factory.go +++ b/pkg/generated/controllers/extensions/factory.go @@ -20,7 +20,7 @@ package extensions import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "k8s.io/client-go/rest" ) diff --git a/pkg/generated/controllers/extensions/interface.go b/pkg/generated/controllers/extensions/interface.go index c6673bea..113dbe45 100644 --- a/pkg/generated/controllers/extensions/interface.go +++ b/pkg/generated/controllers/extensions/interface.go @@ -20,7 +20,7 @@ package extensions import ( "github.com/rancher/lasso/pkg/controller" - v1beta1 "github.com/rancher/wrangler/pkg/generated/controllers/extensions/v1beta1" + v1beta1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/extensions/v1beta1" ) type Interface interface { diff --git a/pkg/generated/controllers/extensions/v1beta1/ingress.go b/pkg/generated/controllers/extensions/v1beta1/ingress.go index c8ed73a7..65892dda 100644 --- a/pkg/generated/controllers/extensions/v1beta1/ingress.go +++ b/pkg/generated/controllers/extensions/v1beta1/ingress.go @@ -22,10 +22,10 @@ import ( "context" "time" - "github.com/rancher/wrangler/pkg/apply" - "github.com/rancher/wrangler/pkg/condition" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/condition" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" v1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generated/controllers/extensions/v1beta1/interface.go b/pkg/generated/controllers/extensions/v1beta1/interface.go index 1126cf21..12b62c21 100644 --- a/pkg/generated/controllers/extensions/v1beta1/interface.go +++ b/pkg/generated/controllers/extensions/v1beta1/interface.go @@ -20,8 +20,8 @@ package v1beta1 import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemes" v1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/generated/controllers/networking.k8s.io/factory.go b/pkg/generated/controllers/networking.k8s.io/factory.go index e5c85aba..7683a29f 100644 --- a/pkg/generated/controllers/networking.k8s.io/factory.go +++ b/pkg/generated/controllers/networking.k8s.io/factory.go @@ -20,7 +20,7 @@ package networking import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "k8s.io/client-go/rest" ) diff --git a/pkg/generated/controllers/networking.k8s.io/interface.go b/pkg/generated/controllers/networking.k8s.io/interface.go index 46ac963c..74437e6e 100644 --- a/pkg/generated/controllers/networking.k8s.io/interface.go +++ b/pkg/generated/controllers/networking.k8s.io/interface.go @@ -20,7 +20,7 @@ package networking import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/networking.k8s.io/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/networking.k8s.io/v1" ) type Interface interface { diff --git a/pkg/generated/controllers/networking.k8s.io/v1/interface.go b/pkg/generated/controllers/networking.k8s.io/v1/interface.go index f38d5e4a..4f4acb6b 100644 --- a/pkg/generated/controllers/networking.k8s.io/v1/interface.go +++ b/pkg/generated/controllers/networking.k8s.io/v1/interface.go @@ -20,8 +20,8 @@ package v1 import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemes" v1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/generated/controllers/networking.k8s.io/v1/networkpolicy.go b/pkg/generated/controllers/networking.k8s.io/v1/networkpolicy.go index 4719da7e..326fe3bb 100644 --- a/pkg/generated/controllers/networking.k8s.io/v1/networkpolicy.go +++ b/pkg/generated/controllers/networking.k8s.io/v1/networkpolicy.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/networking/v1" ) diff --git a/pkg/generated/controllers/rbac/factory.go b/pkg/generated/controllers/rbac/factory.go index 266d2908..bcc6bcc8 100644 --- a/pkg/generated/controllers/rbac/factory.go +++ b/pkg/generated/controllers/rbac/factory.go @@ -20,7 +20,7 @@ package rbac import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "k8s.io/client-go/rest" ) diff --git a/pkg/generated/controllers/rbac/interface.go b/pkg/generated/controllers/rbac/interface.go index f4bb1f98..682bcc3b 100644 --- a/pkg/generated/controllers/rbac/interface.go +++ b/pkg/generated/controllers/rbac/interface.go @@ -20,7 +20,7 @@ package rbac import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac/v1" ) type Interface interface { diff --git a/pkg/generated/controllers/rbac/v1/clusterrole.go b/pkg/generated/controllers/rbac/v1/clusterrole.go index d515fe96..89d8472f 100644 --- a/pkg/generated/controllers/rbac/v1/clusterrole.go +++ b/pkg/generated/controllers/rbac/v1/clusterrole.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/rbac/v1" ) diff --git a/pkg/generated/controllers/rbac/v1/clusterrolebinding.go b/pkg/generated/controllers/rbac/v1/clusterrolebinding.go index b191f463..964156c1 100644 --- a/pkg/generated/controllers/rbac/v1/clusterrolebinding.go +++ b/pkg/generated/controllers/rbac/v1/clusterrolebinding.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/rbac/v1" ) diff --git a/pkg/generated/controllers/rbac/v1/interface.go b/pkg/generated/controllers/rbac/v1/interface.go index cff09749..9381c283 100644 --- a/pkg/generated/controllers/rbac/v1/interface.go +++ b/pkg/generated/controllers/rbac/v1/interface.go @@ -20,8 +20,8 @@ package v1 import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemes" v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/generated/controllers/rbac/v1/role.go b/pkg/generated/controllers/rbac/v1/role.go index d1898057..fe8347d3 100644 --- a/pkg/generated/controllers/rbac/v1/role.go +++ b/pkg/generated/controllers/rbac/v1/role.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/rbac/v1" ) diff --git a/pkg/generated/controllers/rbac/v1/rolebinding.go b/pkg/generated/controllers/rbac/v1/rolebinding.go index 2593e36d..3769c086 100644 --- a/pkg/generated/controllers/rbac/v1/rolebinding.go +++ b/pkg/generated/controllers/rbac/v1/rolebinding.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/rbac/v1" ) diff --git a/pkg/generated/controllers/storage/factory.go b/pkg/generated/controllers/storage/factory.go index cbb35217..d719d299 100644 --- a/pkg/generated/controllers/storage/factory.go +++ b/pkg/generated/controllers/storage/factory.go @@ -20,7 +20,7 @@ package storage import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" "k8s.io/client-go/rest" ) diff --git a/pkg/generated/controllers/storage/interface.go b/pkg/generated/controllers/storage/interface.go index f69ca152..f65b5762 100644 --- a/pkg/generated/controllers/storage/interface.go +++ b/pkg/generated/controllers/storage/interface.go @@ -20,7 +20,7 @@ package storage import ( "github.com/rancher/lasso/pkg/controller" - v1 "github.com/rancher/wrangler/pkg/generated/controllers/storage/v1" + v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/storage/v1" ) type Interface interface { diff --git a/pkg/generated/controllers/storage/v1/interface.go b/pkg/generated/controllers/storage/v1/interface.go index 2ad2e9b5..5bc5a35b 100644 --- a/pkg/generated/controllers/storage/v1/interface.go +++ b/pkg/generated/controllers/storage/v1/interface.go @@ -20,8 +20,8 @@ package v1 import ( "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/schemes" v1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/generated/controllers/storage/v1/storageclass.go b/pkg/generated/controllers/storage/v1/storageclass.go index e3f299c3..02f9c092 100644 --- a/pkg/generated/controllers/storage/v1/storageclass.go +++ b/pkg/generated/controllers/storage/v1/storageclass.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - "github.com/rancher/wrangler/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/api/storage/v1" ) diff --git a/pkg/generic/factory.go b/pkg/generic/factory.go index ce4370d9..5b2cd681 100644 --- a/pkg/generic/factory.go +++ b/pkg/generic/factory.go @@ -11,7 +11,7 @@ import ( "github.com/rancher/lasso/pkg/cache" "github.com/rancher/lasso/pkg/client" "github.com/rancher/lasso/pkg/controller" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/schemes" "k8s.io/apimachinery/pkg/runtime/schema" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/rest" diff --git a/pkg/generic/fake/README.md b/pkg/generic/fake/README.md index d5824d75..7c3e8243 100644 --- a/pkg/generic/fake/README.md +++ b/pkg/generic/fake/README.md @@ -26,8 +26,8 @@ import ( "testing" "github.com/golang/mock/gomock" - wranglerv1 "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" - "github.com/rancher/wrangler/pkg/generic/fake" + wranglerv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac/v1" + "github.com/rancher/wrangler/v2/pkg/generic/fake" v1 "k8s.io/api/apps/v1" ) diff --git a/pkg/generic/fake/cache.go b/pkg/generic/fake/cache.go index c484a833..38274def 100644 --- a/pkg/generic/fake/cache.go +++ b/pkg/generic/fake/cache.go @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - generic "github.com/rancher/wrangler/pkg/generic" + generic "github.com/rancher/wrangler/v2/pkg/generic" labels "k8s.io/apimachinery/pkg/labels" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/generic/fake/controller.go b/pkg/generic/fake/controller.go index b9f6d225..0d75cbe5 100644 --- a/pkg/generic/fake/controller.go +++ b/pkg/generic/fake/controller.go @@ -10,7 +10,7 @@ import ( time "time" gomock "github.com/golang/mock/gomock" - generic "github.com/rancher/wrangler/pkg/generic" + generic "github.com/rancher/wrangler/v2/pkg/generic" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generic/fake/fake_test.go b/pkg/generic/fake/fake_test.go index 57851243..0bae783c 100644 --- a/pkg/generic/fake/fake_test.go +++ b/pkg/generic/fake/fake_test.go @@ -3,8 +3,8 @@ package fake_test import ( "testing" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/generic/fake" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/generic/fake" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/generic/generating.go b/pkg/generic/generating.go index 9ac9fae8..9904d763 100644 --- a/pkg/generic/generating.go +++ b/pkg/generic/generating.go @@ -1,7 +1,7 @@ package generic import ( - "github.com/rancher/wrangler/pkg/apply" + "github.com/rancher/wrangler/v2/pkg/apply" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/gvk/get.go b/pkg/gvk/get.go index 743dc00b..5901376f 100644 --- a/pkg/gvk/get.go +++ b/pkg/gvk/get.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/pkg/errors" - "github.com/rancher/wrangler/pkg/schemes" + "github.com/rancher/wrangler/v2/pkg/schemes" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/kstatus/kstatus.go b/pkg/kstatus/kstatus.go index 8a8b5beb..362950b7 100644 --- a/pkg/kstatus/kstatus.go +++ b/pkg/kstatus/kstatus.go @@ -1,6 +1,6 @@ package kstatus -import "github.com/rancher/wrangler/pkg/condition" +import "github.com/rancher/wrangler/v2/pkg/condition" // Conditions read by the kstatus package diff --git a/pkg/needacert/needacert.go b/pkg/needacert/needacert.go index fd2eb895..7f634806 100644 --- a/pkg/needacert/needacert.go +++ b/pkg/needacert/needacert.go @@ -10,11 +10,11 @@ import ( "time" "github.com/moby/locker" - admissionregcontrollers "github.com/rancher/wrangler/pkg/generated/controllers/admissionregistration.k8s.io/v1" - apiextcontrollers "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1" - corecontrollers "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" - "github.com/rancher/wrangler/pkg/gvk" - "github.com/rancher/wrangler/pkg/slice" + admissionregcontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/admissionregistration.k8s.io/v1" + apiextcontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io/v1" + corecontrollers "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/v2/pkg/gvk" + "github.com/rancher/wrangler/v2/pkg/slice" adminregv1 "k8s.io/api/admissionregistration/v1" corev1 "k8s.io/api/core/v1" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/pkg/objectset/objectset.go b/pkg/objectset/objectset.go index d6c066f0..cc393385 100644 --- a/pkg/objectset/objectset.go +++ b/pkg/objectset/objectset.go @@ -6,10 +6,10 @@ import ( "sort" "github.com/pkg/errors" - "github.com/rancher/wrangler/pkg/gvk" - "github.com/rancher/wrangler/pkg/stringset" + "github.com/rancher/wrangler/v2/pkg/gvk" + "github.com/rancher/wrangler/v2/pkg/stringset" - "github.com/rancher/wrangler/pkg/merr" + "github.com/rancher/wrangler/v2/pkg/merr" "k8s.io/apimachinery/pkg/api/meta" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/patch/style.go b/pkg/patch/style.go index 88135c8d..bf9137de 100644 --- a/pkg/patch/style.go +++ b/pkg/patch/style.go @@ -3,7 +3,7 @@ package patch import ( "sync" - "github.com/rancher/wrangler/pkg/gvk" + "github.com/rancher/wrangler/v2/pkg/gvk" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/relatedresource/changeset.go b/pkg/relatedresource/changeset.go index 991d010d..807ef956 100644 --- a/pkg/relatedresource/changeset.go +++ b/pkg/relatedresource/changeset.go @@ -6,8 +6,8 @@ import ( "k8s.io/apimachinery/pkg/api/meta" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/kv" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/cache" ) diff --git a/pkg/schemas/definition/definition.go b/pkg/schemas/definition/definition.go index c3fe964c..821998e0 100644 --- a/pkg/schemas/definition/definition.go +++ b/pkg/schemas/definition/definition.go @@ -3,7 +3,7 @@ package definition import ( "strings" - "github.com/rancher/wrangler/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/data/convert" ) func IsMapType(fieldType string) bool { diff --git a/pkg/schemas/mapper.go b/pkg/schemas/mapper.go index 4d051b74..f26529c5 100644 --- a/pkg/schemas/mapper.go +++ b/pkg/schemas/mapper.go @@ -1,10 +1,10 @@ package schemas import ( - "github.com/rancher/wrangler/pkg/data" - "github.com/rancher/wrangler/pkg/data/convert" - "github.com/rancher/wrangler/pkg/merr" - "github.com/rancher/wrangler/pkg/schemas/definition" + "github.com/rancher/wrangler/v2/pkg/data" + "github.com/rancher/wrangler/v2/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/merr" + "github.com/rancher/wrangler/v2/pkg/schemas/definition" ) type Mapper interface { diff --git a/pkg/schemas/mappers/access.go b/pkg/schemas/mappers/access.go index 6d55a53b..16221552 100644 --- a/pkg/schemas/mappers/access.go +++ b/pkg/schemas/mappers/access.go @@ -3,8 +3,8 @@ package mappers import ( "strings" - "github.com/rancher/wrangler/pkg/data" - types "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/data" + types "github.com/rancher/wrangler/v2/pkg/schemas" ) type Access struct { diff --git a/pkg/schemas/mappers/alias.go b/pkg/schemas/mappers/alias.go index d3f1d21d..f1df6ecf 100644 --- a/pkg/schemas/mappers/alias.go +++ b/pkg/schemas/mappers/alias.go @@ -1,8 +1,8 @@ package mappers import ( - "github.com/rancher/wrangler/pkg/data" - types "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/data" + types "github.com/rancher/wrangler/v2/pkg/schemas" ) type AliasField struct { diff --git a/pkg/schemas/mappers/check.go b/pkg/schemas/mappers/check.go index d693bf79..e7f7df11 100644 --- a/pkg/schemas/mappers/check.go +++ b/pkg/schemas/mappers/check.go @@ -3,7 +3,7 @@ package mappers import ( "fmt" - types "github.com/rancher/wrangler/pkg/schemas" + types "github.com/rancher/wrangler/v2/pkg/schemas" ) func ValidateField(field string, schema *types.Schema) error { diff --git a/pkg/schemas/mappers/condition.go b/pkg/schemas/mappers/condition.go index ad927380..d94d4b02 100644 --- a/pkg/schemas/mappers/condition.go +++ b/pkg/schemas/mappers/condition.go @@ -1,7 +1,7 @@ package mappers import ( - types "github.com/rancher/wrangler/pkg/schemas" + types "github.com/rancher/wrangler/v2/pkg/schemas" ) type Condition struct { diff --git a/pkg/schemas/mappers/copy.go b/pkg/schemas/mappers/copy.go index 75b661ad..0c323da6 100644 --- a/pkg/schemas/mappers/copy.go +++ b/pkg/schemas/mappers/copy.go @@ -3,7 +3,7 @@ package mappers import ( "fmt" - types "github.com/rancher/wrangler/pkg/schemas" + types "github.com/rancher/wrangler/v2/pkg/schemas" ) type Copy struct { diff --git a/pkg/schemas/mappers/default.go b/pkg/schemas/mappers/default.go index 6ec6e121..2ee9f595 100644 --- a/pkg/schemas/mappers/default.go +++ b/pkg/schemas/mappers/default.go @@ -1,8 +1,8 @@ package mappers import ( - "github.com/rancher/wrangler/pkg/data" - types "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/data" + types "github.com/rancher/wrangler/v2/pkg/schemas" ) type DefaultMapper struct { diff --git a/pkg/schemas/mappers/drop.go b/pkg/schemas/mappers/drop.go index 1781b9b5..2376dcfe 100644 --- a/pkg/schemas/mappers/drop.go +++ b/pkg/schemas/mappers/drop.go @@ -3,8 +3,8 @@ package mappers import ( "fmt" - "github.com/rancher/wrangler/pkg/data" - types "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/data" + types "github.com/rancher/wrangler/v2/pkg/schemas" ) type Drop struct { diff --git a/pkg/schemas/mappers/embed.go b/pkg/schemas/mappers/embed.go index 03afd5b1..6510af4a 100644 --- a/pkg/schemas/mappers/embed.go +++ b/pkg/schemas/mappers/embed.go @@ -3,8 +3,8 @@ package mappers import ( "fmt" - "github.com/rancher/wrangler/pkg/data" - types "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/data" + types "github.com/rancher/wrangler/v2/pkg/schemas" ) type Embed struct { diff --git a/pkg/schemas/mappers/empty.go b/pkg/schemas/mappers/empty.go index 0bc562b7..35d0e607 100644 --- a/pkg/schemas/mappers/empty.go +++ b/pkg/schemas/mappers/empty.go @@ -1,8 +1,8 @@ package mappers import ( - "github.com/rancher/wrangler/pkg/data" - "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/data" + "github.com/rancher/wrangler/v2/pkg/schemas" ) type EmptyMapper struct { diff --git a/pkg/schemas/mappers/enum.go b/pkg/schemas/mappers/enum.go index d7c2f475..558959b6 100644 --- a/pkg/schemas/mappers/enum.go +++ b/pkg/schemas/mappers/enum.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/rancher/wrangler/pkg/data" - "github.com/rancher/wrangler/pkg/data/convert" - "github.com/rancher/wrangler/pkg/kv" - "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/data" + "github.com/rancher/wrangler/v2/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/schemas" ) type Enum struct { diff --git a/pkg/schemas/mappers/exists.go b/pkg/schemas/mappers/exists.go index 4a1f39d7..b6efe5f1 100644 --- a/pkg/schemas/mappers/exists.go +++ b/pkg/schemas/mappers/exists.go @@ -1,8 +1,8 @@ package mappers import ( - "github.com/rancher/wrangler/pkg/data" - types "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/data" + types "github.com/rancher/wrangler/v2/pkg/schemas" ) type Exists struct { diff --git a/pkg/schemas/mappers/json_keys.go b/pkg/schemas/mappers/json_keys.go index 476beb1a..c010a319 100644 --- a/pkg/schemas/mappers/json_keys.go +++ b/pkg/schemas/mappers/json_keys.go @@ -1,9 +1,9 @@ package mappers import ( - "github.com/rancher/wrangler/pkg/data" - "github.com/rancher/wrangler/pkg/data/convert" - types "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/data" + "github.com/rancher/wrangler/v2/pkg/data/convert" + types "github.com/rancher/wrangler/v2/pkg/schemas" ) type JSONKeys struct { diff --git a/pkg/schemas/mappers/metadata.go b/pkg/schemas/mappers/metadata.go index 2e0ce4db..b6ef9d5a 100644 --- a/pkg/schemas/mappers/metadata.go +++ b/pkg/schemas/mappers/metadata.go @@ -1,7 +1,7 @@ package mappers import ( - types "github.com/rancher/wrangler/pkg/schemas" + types "github.com/rancher/wrangler/v2/pkg/schemas" ) func NewMetadataMapper() types.Mapper { diff --git a/pkg/schemas/mappers/move.go b/pkg/schemas/mappers/move.go index b426e455..9e21205f 100644 --- a/pkg/schemas/mappers/move.go +++ b/pkg/schemas/mappers/move.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/rancher/wrangler/pkg/data" - "github.com/rancher/wrangler/pkg/data/convert" - types "github.com/rancher/wrangler/pkg/schemas" - "github.com/rancher/wrangler/pkg/schemas/definition" + "github.com/rancher/wrangler/v2/pkg/data" + "github.com/rancher/wrangler/v2/pkg/data/convert" + types "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/schemas/definition" ) type Move struct { diff --git a/pkg/schemas/mappers/set_value.go b/pkg/schemas/mappers/set_value.go index 82157ab8..4ddcc849 100644 --- a/pkg/schemas/mappers/set_value.go +++ b/pkg/schemas/mappers/set_value.go @@ -1,8 +1,8 @@ package mappers import ( - "github.com/rancher/wrangler/pkg/data" - types "github.com/rancher/wrangler/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/data" + types "github.com/rancher/wrangler/v2/pkg/schemas" ) type SetValue struct { diff --git a/pkg/schemas/mappers/slice_to_map.go b/pkg/schemas/mappers/slice_to_map.go index 152f05f7..779815f9 100644 --- a/pkg/schemas/mappers/slice_to_map.go +++ b/pkg/schemas/mappers/slice_to_map.go @@ -3,9 +3,9 @@ package mappers import ( "fmt" - "github.com/rancher/wrangler/pkg/data" - types "github.com/rancher/wrangler/pkg/schemas" - "github.com/rancher/wrangler/pkg/schemas/definition" + "github.com/rancher/wrangler/v2/pkg/data" + types "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/schemas/definition" ) type SliceToMap struct { diff --git a/pkg/schemas/openapi/generate.go b/pkg/schemas/openapi/generate.go index 36d1e1d8..08173808 100644 --- a/pkg/schemas/openapi/generate.go +++ b/pkg/schemas/openapi/generate.go @@ -6,8 +6,8 @@ import ( "sort" "strings" - types "github.com/rancher/wrangler/pkg/schemas" - "github.com/rancher/wrangler/pkg/schemas/definition" + types "github.com/rancher/wrangler/v2/pkg/schemas" + "github.com/rancher/wrangler/v2/pkg/schemas/definition" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" ) diff --git a/pkg/schemas/reflection.go b/pkg/schemas/reflection.go index 970dd6dc..a0a6c96a 100644 --- a/pkg/schemas/reflection.go +++ b/pkg/schemas/reflection.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/rancher/wrangler/pkg/data/convert" - "github.com/rancher/wrangler/pkg/slice" + "github.com/rancher/wrangler/v2/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/slice" "github.com/sirupsen/logrus" ) diff --git a/pkg/schemas/schemas.go b/pkg/schemas/schemas.go index 444276ee..7799f322 100644 --- a/pkg/schemas/schemas.go +++ b/pkg/schemas/schemas.go @@ -6,9 +6,9 @@ import ( "strings" "sync" - "github.com/rancher/wrangler/pkg/data/convert" - "github.com/rancher/wrangler/pkg/merr" - "github.com/rancher/wrangler/pkg/name" + "github.com/rancher/wrangler/v2/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/merr" + "github.com/rancher/wrangler/v2/pkg/name" ) type SchemasInitFunc func(*Schemas) *Schemas diff --git a/pkg/schemas/validation/validation.go b/pkg/schemas/validation/validation.go index a7d27724..948582d8 100644 --- a/pkg/schemas/validation/validation.go +++ b/pkg/schemas/validation/validation.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "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" "k8s.io/apimachinery/pkg/util/validation" ) diff --git a/pkg/summary/cattletypes.go b/pkg/summary/cattletypes.go index 8dbc70fe..32cf8875 100644 --- a/pkg/summary/cattletypes.go +++ b/pkg/summary/cattletypes.go @@ -3,7 +3,7 @@ package summary import ( "strings" - "github.com/rancher/wrangler/pkg/data" + "github.com/rancher/wrangler/v2/pkg/data" ) func checkCattleReady(obj data.Object, condition []Condition, summary Summary) Summary { diff --git a/pkg/summary/client/interface.go b/pkg/summary/client/interface.go index 46243fcb..7ddc8139 100644 --- a/pkg/summary/client/interface.go +++ b/pkg/summary/client/interface.go @@ -3,7 +3,7 @@ package client import ( "context" - "github.com/rancher/wrangler/pkg/summary" + "github.com/rancher/wrangler/v2/pkg/summary" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/summary/client/simple.go b/pkg/summary/client/simple.go index 0277d354..dbb3d8a0 100644 --- a/pkg/summary/client/simple.go +++ b/pkg/summary/client/simple.go @@ -3,7 +3,7 @@ package client import ( "context" - "github.com/rancher/wrangler/pkg/summary" + "github.com/rancher/wrangler/v2/pkg/summary" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/summary/condition.go b/pkg/summary/condition.go index 1853424c..072e40a8 100644 --- a/pkg/summary/condition.go +++ b/pkg/summary/condition.go @@ -6,7 +6,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/rancher/wrangler/pkg/data" + "github.com/rancher/wrangler/v2/pkg/data" ) func GetUnstructuredConditions(obj map[string]interface{}) []Condition { diff --git a/pkg/summary/coretypes.go b/pkg/summary/coretypes.go index 7afa5a91..58666b30 100644 --- a/pkg/summary/coretypes.go +++ b/pkg/summary/coretypes.go @@ -1,8 +1,8 @@ package summary import ( - "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" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/summary/informer/informer.go b/pkg/summary/informer/informer.go index 6cad5f7f..21ec029e 100644 --- a/pkg/summary/informer/informer.go +++ b/pkg/summary/informer/informer.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "github.com/rancher/wrangler/pkg/summary" - "github.com/rancher/wrangler/pkg/summary/client" - "github.com/rancher/wrangler/pkg/summary/lister" + "github.com/rancher/wrangler/v2/pkg/summary" + "github.com/rancher/wrangler/v2/pkg/summary/client" + "github.com/rancher/wrangler/v2/pkg/summary/lister" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/summary/lister/interface.go b/pkg/summary/lister/interface.go index 6fa2919e..592dd144 100644 --- a/pkg/summary/lister/interface.go +++ b/pkg/summary/lister/interface.go @@ -17,7 +17,7 @@ limitations under the License. package lister import ( - "github.com/rancher/wrangler/pkg/summary" + "github.com/rancher/wrangler/v2/pkg/summary" "k8s.io/apimachinery/pkg/labels" ) diff --git a/pkg/summary/lister/lister.go b/pkg/summary/lister/lister.go index 706c2673..4c4b6891 100644 --- a/pkg/summary/lister/lister.go +++ b/pkg/summary/lister/lister.go @@ -17,7 +17,7 @@ limitations under the License. package lister import ( - "github.com/rancher/wrangler/pkg/summary" + "github.com/rancher/wrangler/v2/pkg/summary" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/summary/summarizers.go b/pkg/summary/summarizers.go index d3022a11..0d8f1b15 100644 --- a/pkg/summary/summarizers.go +++ b/pkg/summary/summarizers.go @@ -4,9 +4,9 @@ import ( "strings" "time" - "github.com/rancher/wrangler/pkg/data" - "github.com/rancher/wrangler/pkg/data/convert" - "github.com/rancher/wrangler/pkg/kv" + "github.com/rancher/wrangler/v2/pkg/data" + "github.com/rancher/wrangler/v2/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/kv" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" kstatus "sigs.k8s.io/cli-utils/pkg/kstatus/status" ) diff --git a/pkg/summary/summary.go b/pkg/summary/summary.go index c3317430..44708230 100644 --- a/pkg/summary/summary.go +++ b/pkg/summary/summary.go @@ -3,8 +3,8 @@ package summary import ( "strings" - "github.com/rancher/wrangler/pkg/data" - unstructured2 "github.com/rancher/wrangler/pkg/unstructured" + "github.com/rancher/wrangler/v2/pkg/data" + unstructured2 "github.com/rancher/wrangler/v2/pkg/unstructured" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/trigger/evalall.go b/pkg/trigger/evalall.go index 58a2725d..847cc4bf 100644 --- a/pkg/trigger/evalall.go +++ b/pkg/trigger/evalall.go @@ -5,8 +5,8 @@ import ( "fmt" "sync/atomic" - "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/relatedresource" + "github.com/rancher/wrangler/v2/pkg/generic" + "github.com/rancher/wrangler/v2/pkg/relatedresource" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/unstructured/unstructured.go b/pkg/unstructured/unstructured.go index 8b83723f..f3e8b428 100644 --- a/pkg/unstructured/unstructured.go +++ b/pkg/unstructured/unstructured.go @@ -1,7 +1,7 @@ package unstructured import ( - "github.com/rancher/wrangler/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/data/convert" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/yaml/yaml.go b/pkg/yaml/yaml.go index 390203ad..2e54e7d7 100644 --- a/pkg/yaml/yaml.go +++ b/pkg/yaml/yaml.go @@ -12,8 +12,8 @@ import ( "github.com/ghodss/yaml" "github.com/pkg/errors" - "github.com/rancher/wrangler/pkg/data/convert" - "github.com/rancher/wrangler/pkg/gvk" + "github.com/rancher/wrangler/v2/pkg/data/convert" + "github.com/rancher/wrangler/v2/pkg/gvk" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" yamlDecoder "k8s.io/apimachinery/pkg/util/yaml"