kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52790 from sttts/sttts-conversion-gen-vendor-independent 

Automatic merge from submit-queue (batch tested with PRs 52477, 52790, 52798). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>..

conversion-gen: make staging dirs independent of living in vendor/

The `+k8s:conversion-gen` tags included the package directory inside of kube's vendor dir. This
makes them invalid when we publish staging repos.

Without this PR our sample-apiserver example code-generation is broken once published.

Kubernetes-commit: 74ff323f9e546e62288d331f62a37e0ec58f6b35
This commit is contained in:
Kubernetes Publisher 2017-09-20 15:43:45 -07:00
parent 69cfac46ed 7b23343a61
commit 8e3f903391
5 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
Godeps/Godeps.json generated
View File

@ -856,235 +856,235 @@
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/proxy",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "7a5075a882d5309838390efd479693d06746c831"
"Rev": "8f3a2b50546127afc50792eb4c896c70ec0902d6"
},
{
"ImportPath": "k8s.io/client-go/discovery",

2
pkg/apis/apiserver/v1alpha1/doc.go
View File

@ -15,7 +15,7 @@ limitations under the License.
*/
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/apis/apiserver
// +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/apiserver
// +k8s:defaulter-gen=TypeMeta
// Package v1alpha1 is the v1alpha1 version of the API.

2
pkg/apis/audit/v1alpha1/doc.go
View File

@ -15,7 +15,7 @@ limitations under the License.
*/
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/apis/audit
// +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/audit
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta

2
pkg/apis/audit/v1beta1/doc.go
View File

@ -15,7 +15,7 @@ limitations under the License.
*/
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/apis/audit
// +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/audit
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta

2
pkg/apis/example/v1/doc.go
View File

@ -15,7 +15,7 @@ limitations under the License.
*/
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/apis/example
// +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/example
// +k8s:openapi-gen=false
// +k8s:defaulter-gen=TypeMeta