github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 04:52:08 +00:00
Code Issues Projects Releases Wiki Activity

kube-gen: cut off conversion-gen from k8s.io/apimachinery

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2017-07-24 17:08:14 +02:00
parent 8a0c28eb04
commit 34397721d6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/conversion.go
View File

@ -24,7 +24,6 @@ import (
"sort" "sort"
"strings" "strings"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/gengo/args" "k8s.io/gengo/args"
"k8s.io/gengo/generator" "k8s.io/gengo/generator"
"k8s.io/gengo/namer" "k8s.io/gengo/namer"
@ -188,7 +187,6 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
glog.Fatalf("Failed loading boilerplate: %v", err) glog.Fatalf("Failed loading boilerplate: %v", err)
} }
inputs := sets.NewString(context.Inputs...)
packages := generator.Packages{} packages := generator.Packages{}
header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...) header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...)
header = append(header, []byte("\n// This file was autogenerated by conversion-gen. Do not edit it manually!\n\n")...) header = append(header, []byte("\n// This file was autogenerated by conversion-gen. Do not edit it manually!\n\n")...)
@ -207,7 +205,14 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
// We are generating conversions only for packages that are explicitly // We are generating conversions only for packages that are explicitly
// passed as InputDir. // passed as InputDir.
for i := range inputs { processed := map[string]bool{}
for _, i := range context.Inputs {
// skip duplicates
if processed[i] {
continue
}
processed[i] = true
glog.V(5).Infof("considering pkg %q", i) glog.V(5).Infof("considering pkg %q", i)
pkg := context.Universe[i] pkg := context.Universe[i]
// typesPkg is where the versioned types are defined. Sometimes it is // typesPkg is where the versioned types are defined. Sometimes it is