Convert all gengo references to gengo/v2

TO REPEAT:

    git ls-files ':!:vendor/k8s.io/gengo' ':!:gengo-v2' ':(glob)**/*.go' \
        | xargs grep -l 'k8s.io/gengo/' \
        | while read F; do \
            sed -i 's|k8s.io/gengo/\([^v]\)|k8s.io/gengo/v2/\1|' $F
        done
This commit is contained in:
Tim Hockin 2024-01-15 12:37:56 -08:00
parent 6f2f3735e0
commit 514dd0e1f6
No known key found for this signature in database
56 changed files with 131 additions and 131 deletions

View File

@ -25,9 +25,9 @@ import (
_ "github.com/onsi/ginkgo/v2/ginkgo"
_ "k8s.io/code-generator/cmd/go-to-protobuf"
_ "k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo"
_ "k8s.io/gengo/examples/deepcopy-gen/generators"
_ "k8s.io/gengo/examples/defaulter-gen/generators"
_ "k8s.io/gengo/examples/import-boss/generators"
_ "k8s.io/gengo/v2/examples/deepcopy-gen/generators"
_ "k8s.io/gengo/v2/examples/defaulter-gen/generators"
_ "k8s.io/gengo/v2/examples/import-boss/generators"
_ "k8s.io/kube-openapi/cmd/openapi-gen"
// submodule test dependencies

View File

@ -21,8 +21,8 @@ import (
"path"
"github.com/spf13/pflag"
"k8s.io/gengo/args"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2/types"
codegenutil "k8s.io/code-generator/pkg/util"
)

View File

@ -23,7 +23,7 @@ import (
"fmt"
"strings"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/types"
)
type externalApplyConfigurationValue struct {

View File

@ -20,9 +20,9 @@ import (
"io"
"strings"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/klog/v2"
"k8s.io/code-generator/cmd/client-gen/generators/util"

View File

@ -23,9 +23,9 @@ import (
"k8s.io/kube-openapi/pkg/schemaconv"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
// utilGenerator generates the ForKind() utility function.

View File

@ -20,7 +20,7 @@ import (
"reflect"
"strings"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/types"
)
// TODO: This implements the same functionality as https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/runtime/converter.go#L236

View File

@ -23,7 +23,7 @@ import (
"strings"
openapiv2 "github.com/google/gnostic-models/openapiv2"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/types"
utilproto "k8s.io/kube-openapi/pkg/util/proto"
"k8s.io/kube-openapi/pkg/validation/spec"
)

View File

@ -23,10 +23,10 @@ import (
"sort"
"strings"
"k8s.io/gengo/args"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/klog/v2"
applygenargs "k8s.io/code-generator/cmd/applyconfiguration-gen/args"

View File

@ -17,7 +17,7 @@ limitations under the License.
package generators
import (
"k8s.io/gengo/types"
"k8s.io/gengo/v2/types"
"k8s.io/code-generator/cmd/client-gen/generators/util"
)

View File

@ -16,7 +16,7 @@ limitations under the License.
package generators
import "k8s.io/gengo/types"
import "k8s.io/gengo/v2/types"
var (
applyConfiguration = types.Ref("k8s.io/apimachinery/pkg/runtime", "ApplyConfiguration")

View File

@ -23,9 +23,9 @@ import (
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
// utilGenerator generates the ForKind() utility function.

View File

@ -21,7 +21,7 @@ import (
"path"
"github.com/spf13/pflag"
"k8s.io/gengo/args"
"k8s.io/gengo/v2/args"
"k8s.io/code-generator/cmd/client-gen/types"
codegenutil "k8s.io/code-generator/pkg/util"

View File

@ -29,10 +29,10 @@ import (
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
codegennamer "k8s.io/code-generator/pkg/namer"
genutil "k8s.io/code-generator/pkg/util"
"k8s.io/gengo/args"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/klog/v2"
)

View File

@ -20,8 +20,8 @@ import (
"path/filepath"
"strings"
"k8s.io/gengo/generator"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/types"
clientgenargs "k8s.io/code-generator/cmd/client-gen/args"
scheme "k8s.io/code-generator/cmd/client-gen/generators/scheme"

View File

@ -23,9 +23,9 @@ import (
"strings"
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
// genClientset generates a package for a clientset.

View File

@ -22,9 +22,9 @@ import (
"path/filepath"
"strings"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/code-generator/cmd/client-gen/generators/util"
)

View File

@ -22,9 +22,9 @@ import (
"path/filepath"
"strings"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/code-generator/cmd/client-gen/generators/util"
)

View File

@ -23,9 +23,9 @@ import (
"strings"
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
// genClientset generates a package for a clientset.

View File

@ -22,8 +22,8 @@ import (
"path/filepath"
"strings"
"k8s.io/gengo/generator"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/types"
)
// genExpansion produces a file for a group client, e.g. ExtensionsClient for the extension group.

View File

@ -20,9 +20,9 @@ import (
"io"
"path/filepath"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/code-generator/cmd/client-gen/generators/util"
"k8s.io/code-generator/cmd/client-gen/path"

View File

@ -22,9 +22,9 @@ import (
"path/filepath"
"strings"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/code-generator/cmd/client-gen/generators/util"
)

View File

@ -25,9 +25,9 @@ import (
"k8s.io/code-generator/cmd/client-gen/path"
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
// GenScheme produces a package for a clientset with the scheme, codecs and parameter codecs.

View File

@ -21,7 +21,7 @@ import (
"fmt"
"strings"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/types"
)
var supportedTags = []string{

View File

@ -22,7 +22,7 @@ import (
"sort"
"strings"
"k8s.io/gengo/namer"
"k8s.io/gengo/v2/namer"
)
// ToGroupVersion turns "group/version" string into a GroupVersion struct. It reports error

View File

@ -20,7 +20,7 @@ import (
"fmt"
"github.com/spf13/pflag"
"k8s.io/gengo/args"
"k8s.io/gengo/v2/args"
)
// DefaultBasePeerDirs are the peer-dirs nearly everybody will use, i.e. those coming from

View File

@ -25,10 +25,10 @@ import (
"sort"
"strings"
"k8s.io/gengo/args"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/klog/v2"

View File

@ -20,8 +20,8 @@ import (
"fmt"
"github.com/spf13/pflag"
"k8s.io/gengo/args"
"k8s.io/gengo/examples/deepcopy-gen/generators"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2/examples/deepcopy-gen/generators"
)
// CustomArgs is used by the gengo framework to pass args specific to this generator.

View File

@ -49,7 +49,7 @@ import (
"flag"
"github.com/spf13/pflag"
"k8s.io/gengo/examples/deepcopy-gen/generators"
"k8s.io/gengo/v2/examples/deepcopy-gen/generators"
"k8s.io/klog/v2"
generatorargs "k8s.io/code-generator/cmd/deepcopy-gen/args"

View File

@ -20,8 +20,8 @@ import (
"fmt"
"github.com/spf13/pflag"
"k8s.io/gengo/args"
"k8s.io/gengo/examples/defaulter-gen/generators"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2/examples/defaulter-gen/generators"
)
// CustomArgs is used by the gengo framework to pass args specific to this generator.

View File

@ -45,7 +45,7 @@ import (
"flag"
"github.com/spf13/pflag"
"k8s.io/gengo/examples/defaulter-gen/generators"
"k8s.io/gengo/v2/examples/defaulter-gen/generators"
"k8s.io/klog/v2"
generatorargs "k8s.io/code-generator/cmd/defaulter-gen/args"

View File

@ -30,11 +30,11 @@ import (
flag "github.com/spf13/pflag"
"k8s.io/gengo/args"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/parser"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/parser"
"k8s.io/gengo/v2/types"
)
type Generator struct {

View File

@ -27,9 +27,9 @@ import (
"k8s.io/klog/v2"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
// genProtoIDL produces a .proto IDL.

View File

@ -17,8 +17,8 @@ limitations under the License.
package protobuf
import (
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
type ImportTracker struct {

View File

@ -21,9 +21,9 @@ import (
"reflect"
"strings"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
type localNamer struct {

View File

@ -25,8 +25,8 @@ import (
"reflect"
"strings"
"k8s.io/gengo/generator"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/types"
)
func newProtobufPackage(packagePath, packageName string, generateAll bool, omitFieldTypes map[types.Name]struct{}) *protobufPackage {

View File

@ -17,7 +17,7 @@ limitations under the License.
package protobuf
import (
"k8s.io/gengo/types"
"k8s.io/gengo/v2/types"
"k8s.io/klog/v2"
)

View File

@ -21,8 +21,8 @@ import (
"os"
"github.com/spf13/pflag"
"k8s.io/gengo/args"
"k8s.io/gengo/examples/import-boss/generators"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2/examples/import-boss/generators"
"k8s.io/klog/v2"
)

View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/pflag"
codegenutil "k8s.io/code-generator/pkg/util"
"k8s.io/gengo/args"
"k8s.io/gengo/v2/args"
)
// CustomArgs is used by the gengo framework to pass args specific to this generator.

View File

@ -21,9 +21,9 @@ import (
"path"
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/klog/v2"
)

View File

@ -19,9 +19,9 @@ package generators
import (
"io"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/klog/v2"
)

View File

@ -23,9 +23,9 @@ import (
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
codegennamer "k8s.io/code-generator/pkg/namer"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
// genericGenerator generates the generic informer.

View File

@ -22,9 +22,9 @@ import (
"strings"
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
// groupInterfaceGenerator generates the per-group interface file.

View File

@ -21,9 +21,9 @@ import (
"io"
"strings"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/code-generator/cmd/client-gen/generators/util"
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"

View File

@ -22,10 +22,10 @@ import (
"path/filepath"
"strings"
"k8s.io/gengo/args"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/klog/v2"
"k8s.io/code-generator/cmd/client-gen/generators/util"

View File

@ -16,7 +16,7 @@ limitations under the License.
package generators
import "k8s.io/gengo/types"
import "k8s.io/gengo/v2/types"
var (
apiScheme = types.Name{Package: "k8s.io/kubernetes/pkg/api/legacyscheme", Name: "Scheme"}

View File

@ -19,9 +19,9 @@ package generators
import (
"io"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/code-generator/cmd/client-gen/generators/util"
)

View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/pflag"
codegenutil "k8s.io/code-generator/pkg/util"
"k8s.io/gengo/args"
"k8s.io/gengo/v2/args"
)
// CustomArgs is used by the gengo framework to pass args specific to this generator.

View File

@ -22,8 +22,8 @@ import (
"path/filepath"
"strings"
"k8s.io/gengo/generator"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/types"
"k8s.io/code-generator/cmd/client-gen/generators/util"
)

View File

@ -22,10 +22,10 @@ import (
"path/filepath"
"strings"
"k8s.io/gengo/args"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/code-generator/cmd/client-gen/generators/util"
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"

View File

@ -21,7 +21,7 @@ import (
"github.com/spf13/pflag"
statusgenerators "k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators"
"k8s.io/gengo/args"
"k8s.io/gengo/v2/args"
)
// CustomArgs is used by the gengo framework to pass args specific to this generator.

View File

@ -23,10 +23,10 @@ import (
"strconv"
"strings"
"k8s.io/gengo/args"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
"k8s.io/klog/v2"
)

View File

@ -22,7 +22,7 @@ import (
"strconv"
"testing"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/types"
"k8s.io/klog/v2"
)

View File

@ -19,7 +19,7 @@ package args
import (
"fmt"
"k8s.io/gengo/args"
"k8s.io/gengo/v2/args"
)
// NewDefaults returns default arguments for the generator.

View File

@ -25,10 +25,10 @@ import (
"k8s.io/klog/v2"
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
"k8s.io/gengo/args"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/args"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
// NameSystems returns the name system used by the generators in this package.

View File

@ -21,9 +21,9 @@ import (
"sort"
clientgentypes "k8s.io/code-generator/cmd/client-gen/types"
"k8s.io/gengo/generator"
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/generator"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
type registerExternalGenerator struct {

View File

@ -17,8 +17,8 @@ limitations under the License.
package namer
import (
"k8s.io/gengo/namer"
"k8s.io/gengo/types"
"k8s.io/gengo/v2/namer"
"k8s.io/gengo/v2/types"
)
// TagOverrideNamer is a namer which pulls names from a given tag, if specified,