github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #51056 from thockin/missing-conversion-peer

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 45724, 48051, 46444, 51056, 51605)

Add v1 API as a default conversion peer

Some of the APIs call do not this out, and a partial build produces
wrong results.
This commit is contained in:
Kubernetes Submit Queue 2017-09-02 12:11:10 -07:00 committed by GitHub
commit 8d6160abda
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go
View File

@ -52,9 +52,12 @@ func main() {
arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt") arguments.GoHeaderFilePath = filepath.Join(args.DefaultSourceTree(), "k8s.io/kubernetes/hack/boilerplate/boilerplate.go.txt")
// Custom args. // Custom args.
// TODO: make callers pass this in. It is too opaque here, and any use of
// the flag that DOESN'T include these is broken.
customArgs := &generators.CustomArgs{ customArgs := &generators.CustomArgs{
ExtraPeerDirs: []string{ ExtraPeerDirs: []string{
"k8s.io/kubernetes/pkg/api", "k8s.io/kubernetes/pkg/api",
"k8s.io/kubernetes/pkg/api/v1",
"k8s.io/api/core/v1", "k8s.io/api/core/v1",
"k8s.io/apimachinery/pkg/apis/meta/v1", "k8s.io/apimachinery/pkg/apis/meta/v1",
"k8s.io/apimachinery/pkg/conversion", "k8s.io/apimachinery/pkg/conversion",