Merge pull request rancher#317 from rmweir/update-v2

Update v2

.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/[email protected]
       - ./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/[email protected]
       - ./scripts/ci

.github/workflows/lint.yaml

@@ -1,7 +1,7 @@
 name: golangci-lint
 
 env:
-  SETUP_GO_VERSION: '^1.19'
+  SETUP_GO_VERSION: '^1.20'
 
 on:
   push:

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"
 )
 

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

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"

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"

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"

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"

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"

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"

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"
 )

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"

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{

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"
 )
 

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

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"

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"
 )

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))
 	}
 

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"

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"

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"
 )

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"

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"

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\"",

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

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"