diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go index cbe4423c3e6..11ca137b12d 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go @@ -91,9 +91,9 @@ func New() *Generator { `k8s.io/api/storage/v1beta1`, `k8s.io/api/storage/v1`, `k8s.io/api/admissionregistration/v1alpha1`, + `k8s.io/api/admission/v1alpha1`, `k8s.io/api/networking/v1`, `k8s.io/kubernetes/federation/apis/federation/v1beta1`, - `k8s.io/kubernetes/pkg/apis/admission/v1alpha1`, `k8s.io/metrics/pkg/apis/metrics/v1alpha1`, `k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1`, `k8s.io/apiserver/pkg/apis/audit/v1alpha1`, diff --git a/hack/.golint_failures b/hack/.golint_failures index e5b5ec91b95..12ab12afe87 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -528,6 +528,7 @@ plugin/pkg/scheduler/schedulercache plugin/pkg/scheduler/testing plugin/pkg/scheduler/util staging +staging/src/k8s.io/api/admission/v1alpha1 staging/src/k8s.io/api/admissionregistration/v1alpha1 staging/src/k8s.io/api/apps/v1beta1 staging/src/k8s.io/api/authentication/v1 diff --git a/pkg/apis/admission/install/install.go b/pkg/apis/admission/install/install.go index fca70e225e0..96b85d5491b 100644 --- a/pkg/apis/admission/install/install.go +++ b/pkg/apis/admission/install/install.go @@ -38,7 +38,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: admission.GroupName, VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/kubernetes/pkg/apis/admission", + ImportPrefix: "k8s.io/api/admission", RootScopedKinds: sets.NewString("AdmissionReview"), AddInternalObjectsToScheme: admission.AddToScheme, }, diff --git a/pkg/apis/admission/v1alpha1/BUILD b/pkg/apis/admission/v1alpha1/BUILD index 02294f0af1c..04bdde67d5e 100644 --- a/pkg/apis/admission/v1alpha1/BUILD +++ b/pkg/apis/admission/v1alpha1/BUILD @@ -11,27 +11,20 @@ go_library( name = "go_default_library", srcs = [ "doc.go", - "generated.pb.go", "helpers.go", "register.go", - "types.generated.go", - "types.go", - "types_swagger_doc_generated.go", "zz_generated.conversion.go", - "zz_generated.deepcopy.go", "zz_generated.defaults.go", ], tags = ["automanaged"], deps = [ "//pkg/apis/admission:go_default_library", - "//vendor/github.com/gogo/protobuf/proto:go_default_library", - "//vendor/github.com/ugorji/go/codec:go_default_library", + "//vendor/k8s.io/api/admission/v1alpha1:go_default_library", "//vendor/k8s.io/api/authentication/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission:go_default_library", ], ) diff --git a/pkg/apis/admission/v1alpha1/doc.go b/pkg/apis/admission/v1alpha1/doc.go index 8046120c0e1..c2651742708 100644 --- a/pkg/apis/admission/v1alpha1/doc.go +++ b/pkg/apis/admission/v1alpha1/doc.go @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:deepcopy-gen=package,register // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/admission -// +k8s:openapi-gen=false +// +k8s:conversion-gen-external-types=../../../../vendor/k8s.io/api/admission/v1alpha1 // +k8s:defaulter-gen=TypeMeta +// +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/admission/v1alpha1 // +groupName=admission.k8s.io package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/admission/v1alpha1" diff --git a/pkg/apis/admission/v1alpha1/helpers.go b/pkg/apis/admission/v1alpha1/helpers.go index 4ef60671024..c7a3960b655 100644 --- a/pkg/apis/admission/v1alpha1/helpers.go +++ b/pkg/apis/admission/v1alpha1/helpers.go @@ -17,6 +17,7 @@ limitations under the License. package v1alpha1 import ( + admissionv1alpha1 "k8s.io/api/admission/v1alpha1" authenticationv1 "k8s.io/api/authentication/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -24,7 +25,7 @@ import ( ) // NewAdmissionReview returns an AdmissionReview for the provided admission.Attributes -func NewAdmissionReview(attr admission.Attributes) AdmissionReview { +func NewAdmissionReview(attr admission.Attributes) admissionv1alpha1.AdmissionReview { gvk := attr.GetKind() gvr := attr.GetResource() aUserInfo := attr.GetUserInfo() @@ -40,8 +41,8 @@ func NewAdmissionReview(attr admission.Attributes) AdmissionReview { userInfo.Extra[key] = authenticationv1.ExtraValue(val) } - return AdmissionReview{ - Spec: AdmissionReviewSpec{ + return admissionv1alpha1.AdmissionReview{ + Spec: admissionv1alpha1.AdmissionReviewSpec{ Name: attr.GetName(), Namespace: attr.GetNamespace(), Resource: metav1.GroupVersionResource{ diff --git a/pkg/apis/admission/v1alpha1/register.go b/pkg/apis/admission/v1alpha1/register.go index d6e2fd735ad..8e12bcea04b 100644 --- a/pkg/apis/admission/v1alpha1/register.go +++ b/pkg/apis/admission/v1alpha1/register.go @@ -17,8 +17,7 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" + admissionv1alpha1 "k8s.io/api/admission/v1alpha1" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -34,10 +33,7 @@ func Resource(resource string) schema.GroupResource { } var ( - // TODO: move SchemeBuilder with zz_generated.deepcopy.go to k8s.io/api. - // localSchemeBuilder and AddToScheme will stay in k8s.io/kubernetes. - SchemeBuilder runtime.SchemeBuilder - localSchemeBuilder = &SchemeBuilder + localSchemeBuilder = &admissionv1alpha1.SchemeBuilder AddToScheme = localSchemeBuilder.AddToScheme ) @@ -45,14 +41,5 @@ func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addKnownTypes, RegisterDefaults) -} - -// Adds the list of known types to api.Scheme. -func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, - &AdmissionReview{}, - ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil + localSchemeBuilder.Register(RegisterDefaults) } diff --git a/pkg/apis/admission/v1alpha1/zz_generated.conversion.go b/pkg/apis/admission/v1alpha1/zz_generated.conversion.go index b590cd62c93..e3047301757 100644 --- a/pkg/apis/admission/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/admission/v1alpha1/zz_generated.conversion.go @@ -21,6 +21,7 @@ limitations under the License. package v1alpha1 import ( + v1alpha1 "k8s.io/api/admission/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" @@ -46,7 +47,7 @@ func RegisterConversions(scheme *runtime.Scheme) error { ) } -func autoConvert_v1alpha1_AdmissionReview_To_admission_AdmissionReview(in *AdmissionReview, out *admission.AdmissionReview, s conversion.Scope) error { +func autoConvert_v1alpha1_AdmissionReview_To_admission_AdmissionReview(in *v1alpha1.AdmissionReview, out *admission.AdmissionReview, s conversion.Scope) error { if err := Convert_v1alpha1_AdmissionReviewSpec_To_admission_AdmissionReviewSpec(&in.Spec, &out.Spec, s); err != nil { return err } @@ -57,11 +58,11 @@ func autoConvert_v1alpha1_AdmissionReview_To_admission_AdmissionReview(in *Admis } // Convert_v1alpha1_AdmissionReview_To_admission_AdmissionReview is an autogenerated conversion function. -func Convert_v1alpha1_AdmissionReview_To_admission_AdmissionReview(in *AdmissionReview, out *admission.AdmissionReview, s conversion.Scope) error { +func Convert_v1alpha1_AdmissionReview_To_admission_AdmissionReview(in *v1alpha1.AdmissionReview, out *admission.AdmissionReview, s conversion.Scope) error { return autoConvert_v1alpha1_AdmissionReview_To_admission_AdmissionReview(in, out, s) } -func autoConvert_admission_AdmissionReview_To_v1alpha1_AdmissionReview(in *admission.AdmissionReview, out *AdmissionReview, s conversion.Scope) error { +func autoConvert_admission_AdmissionReview_To_v1alpha1_AdmissionReview(in *admission.AdmissionReview, out *v1alpha1.AdmissionReview, s conversion.Scope) error { if err := Convert_admission_AdmissionReviewSpec_To_v1alpha1_AdmissionReviewSpec(&in.Spec, &out.Spec, s); err != nil { return err } @@ -72,11 +73,11 @@ func autoConvert_admission_AdmissionReview_To_v1alpha1_AdmissionReview(in *admis } // Convert_admission_AdmissionReview_To_v1alpha1_AdmissionReview is an autogenerated conversion function. -func Convert_admission_AdmissionReview_To_v1alpha1_AdmissionReview(in *admission.AdmissionReview, out *AdmissionReview, s conversion.Scope) error { +func Convert_admission_AdmissionReview_To_v1alpha1_AdmissionReview(in *admission.AdmissionReview, out *v1alpha1.AdmissionReview, s conversion.Scope) error { return autoConvert_admission_AdmissionReview_To_v1alpha1_AdmissionReview(in, out, s) } -func autoConvert_v1alpha1_AdmissionReviewSpec_To_admission_AdmissionReviewSpec(in *AdmissionReviewSpec, out *admission.AdmissionReviewSpec, s conversion.Scope) error { +func autoConvert_v1alpha1_AdmissionReviewSpec_To_admission_AdmissionReviewSpec(in *v1alpha1.AdmissionReviewSpec, out *admission.AdmissionReviewSpec, s conversion.Scope) error { out.Kind = in.Kind if err := runtime.Convert_runtime_RawExtension_To_runtime_Object(&in.Object, &out.Object, s); err != nil { return err @@ -97,11 +98,11 @@ func autoConvert_v1alpha1_AdmissionReviewSpec_To_admission_AdmissionReviewSpec(i } // Convert_v1alpha1_AdmissionReviewSpec_To_admission_AdmissionReviewSpec is an autogenerated conversion function. -func Convert_v1alpha1_AdmissionReviewSpec_To_admission_AdmissionReviewSpec(in *AdmissionReviewSpec, out *admission.AdmissionReviewSpec, s conversion.Scope) error { +func Convert_v1alpha1_AdmissionReviewSpec_To_admission_AdmissionReviewSpec(in *v1alpha1.AdmissionReviewSpec, out *admission.AdmissionReviewSpec, s conversion.Scope) error { return autoConvert_v1alpha1_AdmissionReviewSpec_To_admission_AdmissionReviewSpec(in, out, s) } -func autoConvert_admission_AdmissionReviewSpec_To_v1alpha1_AdmissionReviewSpec(in *admission.AdmissionReviewSpec, out *AdmissionReviewSpec, s conversion.Scope) error { +func autoConvert_admission_AdmissionReviewSpec_To_v1alpha1_AdmissionReviewSpec(in *admission.AdmissionReviewSpec, out *v1alpha1.AdmissionReviewSpec, s conversion.Scope) error { out.Kind = in.Kind out.Name = in.Name out.Namespace = in.Namespace @@ -122,28 +123,28 @@ func autoConvert_admission_AdmissionReviewSpec_To_v1alpha1_AdmissionReviewSpec(i } // Convert_admission_AdmissionReviewSpec_To_v1alpha1_AdmissionReviewSpec is an autogenerated conversion function. -func Convert_admission_AdmissionReviewSpec_To_v1alpha1_AdmissionReviewSpec(in *admission.AdmissionReviewSpec, out *AdmissionReviewSpec, s conversion.Scope) error { +func Convert_admission_AdmissionReviewSpec_To_v1alpha1_AdmissionReviewSpec(in *admission.AdmissionReviewSpec, out *v1alpha1.AdmissionReviewSpec, s conversion.Scope) error { return autoConvert_admission_AdmissionReviewSpec_To_v1alpha1_AdmissionReviewSpec(in, out, s) } -func autoConvert_v1alpha1_AdmissionReviewStatus_To_admission_AdmissionReviewStatus(in *AdmissionReviewStatus, out *admission.AdmissionReviewStatus, s conversion.Scope) error { +func autoConvert_v1alpha1_AdmissionReviewStatus_To_admission_AdmissionReviewStatus(in *v1alpha1.AdmissionReviewStatus, out *admission.AdmissionReviewStatus, s conversion.Scope) error { out.Allowed = in.Allowed out.Result = (*v1.Status)(unsafe.Pointer(in.Result)) return nil } // Convert_v1alpha1_AdmissionReviewStatus_To_admission_AdmissionReviewStatus is an autogenerated conversion function. -func Convert_v1alpha1_AdmissionReviewStatus_To_admission_AdmissionReviewStatus(in *AdmissionReviewStatus, out *admission.AdmissionReviewStatus, s conversion.Scope) error { +func Convert_v1alpha1_AdmissionReviewStatus_To_admission_AdmissionReviewStatus(in *v1alpha1.AdmissionReviewStatus, out *admission.AdmissionReviewStatus, s conversion.Scope) error { return autoConvert_v1alpha1_AdmissionReviewStatus_To_admission_AdmissionReviewStatus(in, out, s) } -func autoConvert_admission_AdmissionReviewStatus_To_v1alpha1_AdmissionReviewStatus(in *admission.AdmissionReviewStatus, out *AdmissionReviewStatus, s conversion.Scope) error { +func autoConvert_admission_AdmissionReviewStatus_To_v1alpha1_AdmissionReviewStatus(in *admission.AdmissionReviewStatus, out *v1alpha1.AdmissionReviewStatus, s conversion.Scope) error { out.Allowed = in.Allowed out.Result = (*v1.Status)(unsafe.Pointer(in.Result)) return nil } // Convert_admission_AdmissionReviewStatus_To_v1alpha1_AdmissionReviewStatus is an autogenerated conversion function. -func Convert_admission_AdmissionReviewStatus_To_v1alpha1_AdmissionReviewStatus(in *admission.AdmissionReviewStatus, out *AdmissionReviewStatus, s conversion.Scope) error { +func Convert_admission_AdmissionReviewStatus_To_v1alpha1_AdmissionReviewStatus(in *admission.AdmissionReviewStatus, out *v1alpha1.AdmissionReviewStatus, s conversion.Scope) error { return autoConvert_admission_AdmissionReviewStatus_To_v1alpha1_AdmissionReviewStatus(in, out, s) } diff --git a/pkg/generated/openapi/BUILD b/pkg/generated/openapi/BUILD index 590a0b6a335..1420e4c07d1 100644 --- a/pkg/generated/openapi/BUILD +++ b/pkg/generated/openapi/BUILD @@ -12,12 +12,12 @@ openapi_library( "federation/apis/federation/v1beta1", "pkg/apis/abac/v0", "pkg/apis/abac/v1beta1", - "pkg/apis/admission/v1alpha1", "pkg/apis/componentconfig/v1alpha1", "pkg/version", ], tags = ["automanaged"], vendor_targets = [ + "k8s.io/api/admission/v1alpha1", "k8s.io/api/admissionregistration/v1alpha1", "k8s.io/api/apps/v1beta1", "k8s.io/api/authentication/v1", diff --git a/plugin/pkg/admission/webhook/BUILD b/plugin/pkg/admission/webhook/BUILD index 2ba7ab92098..36855c34a76 100644 --- a/plugin/pkg/admission/webhook/BUILD +++ b/plugin/pkg/admission/webhook/BUILD @@ -20,7 +20,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/admission/install:go_default_library", - "//pkg/apis/admission/v1alpha1:go_default_library", + "//vendor/k8s.io/api/admission/v1alpha1:go_default_library", "//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", @@ -44,6 +44,7 @@ go_library( "//pkg/kubeapiserver/admission:go_default_library", "//pkg/kubeapiserver/admission/configuration:go_default_library", "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/api/admission/v1alpha1:go_default_library", "//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/plugin/pkg/admission/webhook/admission.go b/plugin/pkg/admission/webhook/admission.go index b21310ea6b0..c5f7cd9e4cd 100644 --- a/plugin/pkg/admission/webhook/admission.go +++ b/plugin/pkg/admission/webhook/admission.go @@ -26,6 +26,7 @@ import ( "github.com/golang/glog" + admissionv1alpha1 "k8s.io/api/admission/v1alpha1" "k8s.io/api/admissionregistration/v1alpha1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -38,7 +39,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" - admissionv1alpha1 "k8s.io/kubernetes/pkg/apis/admission/v1alpha1" + admissionv1alpha1helper "k8s.io/kubernetes/pkg/apis/admission/v1alpha1" admissioninit "k8s.io/kubernetes/pkg/kubeapiserver/admission" "k8s.io/kubernetes/pkg/kubeapiserver/admission/configuration" @@ -213,7 +214,7 @@ func (a *GenericAdmissionWebhook) callHook(ctx context.Context, h *v1alpha1.Exte } // Make the webhook request - request := admissionv1alpha1.NewAdmissionReview(attr) + request := admissionv1alpha1helper.NewAdmissionReview(attr) client, err := a.hookClient(h) if err != nil { return &ErrCallingWebhook{WebhookName: h.Name, Reason: err} diff --git a/plugin/pkg/admission/webhook/admission_test.go b/plugin/pkg/admission/webhook/admission_test.go index e664035d7b3..b018257a499 100644 --- a/plugin/pkg/admission/webhook/admission_test.go +++ b/plugin/pkg/admission/webhook/admission_test.go @@ -27,12 +27,12 @@ import ( "strings" "testing" + "k8s.io/api/admission/v1alpha1" registrationv1alpha1 "k8s.io/api/admissionregistration/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apis/admission/v1alpha1" _ "k8s.io/kubernetes/pkg/apis/admission/install" ) diff --git a/staging/src/k8s.io/api/Godeps/Godeps.json b/staging/src/k8s.io/api/Godeps/Godeps.json index 307e26645de..0da1215b6b4 100644 --- a/staging/src/k8s.io/api/Godeps/Godeps.json +++ b/staging/src/k8s.io/api/Godeps/Godeps.json @@ -14,6 +14,10 @@ "ImportPath": "github.com/PuerkitoBio/urlesc", "Rev": "5bd2802263f21d8788851d5305584c82a5c75d7e" }, + { + "ImportPath": "github.com/davecgh/go-spew/spew", + "Rev": "782f4967f2dc4564575ca782fe2d04090b5faca8" + }, { "ImportPath": "github.com/emicklei/go-restful", "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" @@ -22,6 +26,10 @@ "ImportPath": "github.com/emicklei/go-restful/log", "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" }, + { + "ImportPath": "github.com/ghodss/yaml", + "Rev": "73d445a93680fa1a78ae23a5839bad48f32ba1ee" + }, { "ImportPath": "github.com/go-openapi/jsonpointer", "Rev": "46af16f9f7b149af66e5d1bd010e3574dc06de98" @@ -133,6 +141,10 @@ { "ImportPath": "gopkg.in/inf.v0", "Rev": "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4" + }, + { + "ImportPath": "gopkg.in/yaml.v2", + "Rev": "53feefa2559fb8dfa8d81baad31be332c97d6c77" } ] } diff --git a/staging/src/k8s.io/api/admission/v1alpha1/BUILD b/staging/src/k8s.io/api/admission/v1alpha1/BUILD new file mode 100644 index 00000000000..50efcc10864 --- /dev/null +++ b/staging/src/k8s.io/api/admission/v1alpha1/BUILD @@ -0,0 +1,33 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "doc.go", + "generated.pb.go", + "register.go", + "types.generated.go", + "types.go", + "types_swagger_doc_generated.go", + "zz_generated.deepcopy.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor/github.com/gogo/protobuf/proto:go_default_library", + "//vendor/github.com/ugorji/go/codec:go_default_library", + "//vendor/k8s.io/api/authentication/v1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", + "//vendor/k8s.io/apiserver/pkg/admission:go_default_library", + ], +) diff --git a/staging/src/k8s.io/api/admission/v1alpha1/doc.go b/staging/src/k8s.io/api/admission/v1alpha1/doc.go new file mode 100644 index 00000000000..22c61d99d44 --- /dev/null +++ b/staging/src/k8s.io/api/admission/v1alpha1/doc.go @@ -0,0 +1,21 @@ +/* +Copyright 2017 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// +k8s:deepcopy-gen=package,register +// +k8s:openapi-gen=false + +// +groupName=admission.k8s.io +package v1alpha1 // import "k8s.io/api/admission/v1alpha1" diff --git a/pkg/apis/admission/v1alpha1/generated.pb.go b/staging/src/k8s.io/api/admission/v1alpha1/generated.pb.go similarity index 83% rename from pkg/apis/admission/v1alpha1/generated.pb.go rename to staging/src/k8s.io/api/admission/v1alpha1/generated.pb.go index 00ff3827161..9d3ea2eb583 100644 --- a/pkg/apis/admission/v1alpha1/generated.pb.go +++ b/staging/src/k8s.io/api/admission/v1alpha1/generated.pb.go @@ -15,14 +15,14 @@ limitations under the License. */ // Code generated by protoc-gen-gogo. -// source: k8s.io/kubernetes/pkg/apis/admission/v1alpha1/generated.proto +// source: k8s.io/kubernetes/vendor/k8s.io/api/admission/v1alpha1/generated.proto // DO NOT EDIT! /* Package v1alpha1 is a generated protocol buffer package. It is generated from these files: - k8s.io/kubernetes/pkg/apis/admission/v1alpha1/generated.proto + k8s.io/kubernetes/vendor/k8s.io/api/admission/v1alpha1/generated.proto It has these top-level messages: AdmissionReview @@ -68,9 +68,9 @@ func (*AdmissionReviewStatus) ProtoMessage() {} func (*AdmissionReviewStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{2} } func init() { - proto.RegisterType((*AdmissionReview)(nil), "k8s.io.kubernetes.pkg.apis.admission.v1alpha1.AdmissionReview") - proto.RegisterType((*AdmissionReviewSpec)(nil), "k8s.io.kubernetes.pkg.apis.admission.v1alpha1.AdmissionReviewSpec") - proto.RegisterType((*AdmissionReviewStatus)(nil), "k8s.io.kubernetes.pkg.apis.admission.v1alpha1.AdmissionReviewStatus") + proto.RegisterType((*AdmissionReview)(nil), "k8s.io.api.admission.v1alpha1.AdmissionReview") + proto.RegisterType((*AdmissionReviewSpec)(nil), "k8s.io.api.admission.v1alpha1.AdmissionReviewSpec") + proto.RegisterType((*AdmissionReviewStatus)(nil), "k8s.io.api.admission.v1alpha1.AdmissionReviewStatus") } func (m *AdmissionReview) Marshal() (dAtA []byte, err error) { size := m.Size() @@ -984,50 +984,51 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/kubernetes/pkg/apis/admission/v1alpha1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/api/admission/v1alpha1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ - // 656 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xcf, 0x6b, 0xd4, 0x40, - 0x14, 0xc7, 0x37, 0xba, 0xdd, 0xee, 0x4e, 0xc5, 0xea, 0x14, 0x21, 0xf4, 0x90, 0x96, 0x1e, 0xa4, - 0x42, 0x3b, 0xa1, 0xfe, 0x28, 0x22, 0xf4, 0xd0, 0xa0, 0x88, 0x08, 0xad, 0x4c, 0xad, 0x88, 0x82, - 0x30, 0x9b, 0x7d, 0xdd, 0x1d, 0x37, 0xc9, 0x84, 0x99, 0xc9, 0x56, 0x6f, 0xfe, 0x09, 0x1e, 0xfc, - 0xa3, 0x7a, 0x11, 0x7a, 0xec, 0xa9, 0xd8, 0x15, 0xff, 0x09, 0x4f, 0x92, 0xc9, 0x24, 0xa9, 0xdb, - 0x16, 0xad, 0x9e, 0x76, 0x67, 0xde, 0xfb, 0x7e, 0xe6, 0x3b, 0xef, 0xcd, 0x0b, 0xda, 0x18, 0x3e, - 0x54, 0x84, 0x0b, 0x7f, 0x98, 0x75, 0x41, 0x26, 0xa0, 0x41, 0xf9, 0xe9, 0xb0, 0xef, 0xb3, 0x94, - 0x2b, 0x9f, 0xf5, 0x62, 0xae, 0x14, 0x17, 0x89, 0x3f, 0x5a, 0x63, 0x51, 0x3a, 0x60, 0x6b, 0x7e, - 0x1f, 0x12, 0x90, 0x4c, 0x43, 0x8f, 0xa4, 0x52, 0x68, 0x81, 0x57, 0x0b, 0x39, 0xa9, 0xe5, 0x24, - 0x1d, 0xf6, 0x49, 0x2e, 0x27, 0x95, 0x9c, 0x94, 0xf2, 0xf9, 0xd5, 0x3e, 0xd7, 0x83, 0xac, 0x4b, - 0x42, 0x11, 0xfb, 0x7d, 0xd1, 0x17, 0xbe, 0xa1, 0x74, 0xb3, 0x3d, 0xb3, 0x32, 0x0b, 0xf3, 0xaf, - 0xa0, 0xcf, 0xaf, 0x58, 0x73, 0x2c, 0xe5, 0x3e, 0xcb, 0xf4, 0x00, 0x12, 0xcd, 0x43, 0xa6, 0x0b, - 0x47, 0x93, 0x5e, 0xe6, 0xef, 0xd7, 0xd9, 0x31, 0x0b, 0x07, 0x3c, 0x01, 0xf9, 0xb1, 0xbe, 0x4c, - 0x0c, 0x9a, 0x9d, 0xa7, 0xf2, 0x2f, 0x52, 0xc9, 0x2c, 0xd1, 0x3c, 0x86, 0x33, 0x82, 0xf5, 0x3f, - 0x09, 0x54, 0x38, 0x80, 0x98, 0x9d, 0xd1, 0xdd, 0xbb, 0x48, 0x97, 0x69, 0x1e, 0xf9, 0x3c, 0xd1, - 0x4a, 0xcb, 0x49, 0xd1, 0xd2, 0x0f, 0x07, 0xcd, 0x6e, 0x96, 0x75, 0xa4, 0x30, 0xe2, 0xb0, 0x8f, - 0x7b, 0xa8, 0xa9, 0x52, 0x08, 0x5d, 0x67, 0xd1, 0x59, 0x9e, 0xb9, 0x1b, 0x90, 0x4b, 0xb5, 0x80, - 0x4c, 0xd0, 0x76, 0x52, 0x08, 0x83, 0x6b, 0x07, 0xc7, 0x0b, 0x8d, 0xf1, 0xf1, 0x42, 0x33, 0x5f, - 0x51, 0x43, 0xc7, 0x11, 0x6a, 0x29, 0xcd, 0x74, 0xa6, 0xdc, 0x2b, 0xe6, 0x9c, 0xc7, 0xff, 0x79, - 0x8e, 0x61, 0x05, 0xd7, 0xed, 0x49, 0xad, 0x62, 0x4d, 0xed, 0x19, 0x4b, 0x5f, 0xa7, 0xd0, 0xdc, - 0x39, 0xce, 0xf0, 0x6b, 0xd4, 0x1c, 0xf2, 0xa4, 0x67, 0xef, 0xba, 0x5e, 0x7a, 0x38, 0x5d, 0xc3, - 0xda, 0x45, 0xde, 0x62, 0x32, 0x5a, 0x23, 0x4f, 0xa5, 0xc8, 0xd2, 0x57, 0x20, 0x73, 0xd6, 0x73, - 0x9e, 0xf4, 0xea, 0xfb, 0xe5, 0x2b, 0x6a, 0x88, 0x78, 0x17, 0xb5, 0x44, 0xf7, 0x3d, 0x84, 0xda, - 0xde, 0x6f, 0xf5, 0x42, 0xb6, 0xed, 0x2b, 0xa1, 0x6c, 0xff, 0xc9, 0x07, 0x0d, 0x49, 0x8e, 0xad, - 0x2f, 0xb2, 0x6d, 0x20, 0xd4, 0xc2, 0xf0, 0x3b, 0xd4, 0x11, 0x51, 0xaf, 0xd8, 0x74, 0xaf, 0xfe, - 0x0b, 0xf9, 0xa6, 0x25, 0x77, 0xb6, 0x4b, 0x0e, 0xad, 0x91, 0xf8, 0x2d, 0xea, 0x88, 0x34, 0x7f, - 0x22, 0x5c, 0x24, 0x6e, 0x73, 0xd1, 0x59, 0xee, 0x04, 0x1b, 0x95, 0xa0, 0x0c, 0xfc, 0x3c, 0x5e, - 0x58, 0xae, 0x5f, 0x9b, 0x02, 0x39, 0x02, 0x59, 0x4c, 0x42, 0xd5, 0xa7, 0x2a, 0x97, 0xd6, 0x3c, - 0xbc, 0x88, 0x9a, 0x09, 0x8b, 0xc1, 0x9d, 0x32, 0xdc, 0xaa, 0x6a, 0x5b, 0x2c, 0x06, 0x6a, 0x22, - 0xd8, 0x47, 0x9d, 0xfc, 0x57, 0xa5, 0x2c, 0x04, 0xb7, 0x65, 0xd2, 0x2a, 0xbf, 0x5b, 0x65, 0x80, - 0xd6, 0x39, 0x78, 0x80, 0xda, 0x12, 0x94, 0xc8, 0x64, 0x08, 0xee, 0xb4, 0x29, 0xc7, 0xa3, 0xcb, - 0x37, 0x91, 0x5a, 0x42, 0x70, 0xc3, 0x9e, 0xd5, 0x2e, 0x77, 0x68, 0x45, 0xc7, 0x0f, 0xd0, 0x8c, - 0xca, 0xba, 0x65, 0xc0, 0x6d, 0x1b, 0x73, 0x73, 0x56, 0x30, 0xb3, 0x53, 0x87, 0xe8, 0xe9, 0x3c, - 0xfc, 0x12, 0xb5, 0x33, 0x05, 0xf2, 0x59, 0xb2, 0x27, 0xdc, 0x8e, 0x31, 0x78, 0xfb, 0x94, 0x41, - 0xf2, 0xfb, 0x67, 0x27, 0x37, 0xb6, 0x6b, 0xb3, 0x6b, 0x33, 0xe5, 0x0e, 0xad, 0x48, 0x4b, 0x5f, - 0x1c, 0x74, 0xeb, 0xdc, 0x09, 0xc0, 0x77, 0xd0, 0x34, 0x8b, 0x22, 0xb1, 0x0f, 0xc5, 0xa3, 0x6e, - 0x07, 0xb3, 0x16, 0x33, 0xbd, 0x59, 0x6c, 0xd3, 0x32, 0x8e, 0x5f, 0x4c, 0x8c, 0xe0, 0xca, 0xdf, - 0x55, 0xce, 0x8e, 0x1a, 0xca, 0x5f, 0x27, 0x05, 0x95, 0x45, 0xba, 0x1c, 0xb3, 0x80, 0x1c, 0x9c, - 0x78, 0x8d, 0xc3, 0x13, 0xaf, 0x71, 0x74, 0xe2, 0x35, 0x3e, 0x8d, 0x3d, 0xe7, 0x60, 0xec, 0x39, - 0x87, 0x63, 0xcf, 0x39, 0x1a, 0x7b, 0xce, 0xb7, 0xb1, 0xe7, 0x7c, 0xfe, 0xee, 0x35, 0xde, 0xb4, - 0xcb, 0x21, 0xfe, 0x15, 0x00, 0x00, 0xff, 0xff, 0xd1, 0xeb, 0x48, 0xe6, 0x1e, 0x06, 0x00, 0x00, + // 663 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcf, 0x4b, 0x1c, 0x49, + 0x14, 0xc7, 0xa7, 0x77, 0xc7, 0x71, 0xa6, 0x5c, 0xd6, 0xdd, 0x92, 0x85, 0x46, 0xd8, 0x56, 0x3c, + 0x2c, 0x2e, 0x68, 0x35, 0x1a, 0x23, 0x21, 0x90, 0x83, 0x03, 0x49, 0x08, 0x01, 0x0d, 0xa5, 0x86, + 0x90, 0x84, 0x40, 0x4d, 0xcf, 0x73, 0xa6, 0x32, 0xd3, 0x55, 0x4d, 0x55, 0xf5, 0x98, 0xdc, 0xf2, + 0x27, 0xe4, 0x90, 0x7f, 0x29, 0xe0, 0x25, 0xe0, 0xd1, 0x93, 0xc4, 0xc9, 0x7f, 0x91, 0x53, 0xe8, + 0xea, 0xea, 0x6e, 0x1d, 0x35, 0x89, 0x39, 0xcd, 0xbc, 0x1f, 0xdf, 0x4f, 0xbd, 0x7a, 0xf5, 0x5e, + 0xa3, 0x07, 0x83, 0x3b, 0x9a, 0x70, 0x19, 0x0e, 0xd2, 0x0e, 0x28, 0x01, 0x06, 0x74, 0x38, 0x02, + 0xd1, 0x95, 0x2a, 0x74, 0x01, 0x96, 0xf0, 0x90, 0x75, 0x63, 0xae, 0x35, 0x97, 0x22, 0x1c, 0xad, + 0xb1, 0x61, 0xd2, 0x67, 0x6b, 0x61, 0x0f, 0x04, 0x28, 0x66, 0xa0, 0x4b, 0x12, 0x25, 0x8d, 0xc4, + 0xff, 0xe6, 0xe9, 0x84, 0x25, 0x9c, 0x94, 0xe9, 0xa4, 0x48, 0x9f, 0x5f, 0xed, 0x71, 0xd3, 0x4f, + 0x3b, 0x24, 0x92, 0x71, 0xd8, 0x93, 0x3d, 0x19, 0x5a, 0x55, 0x27, 0x3d, 0xb0, 0x96, 0x35, 0xec, + 0xbf, 0x9c, 0x36, 0xbf, 0x72, 0xfe, 0xf0, 0xd4, 0xf4, 0x41, 0x18, 0x1e, 0x31, 0x93, 0x57, 0x30, + 0x79, 0xf6, 0xfc, 0x46, 0x95, 0x1d, 0xb3, 0xa8, 0xcf, 0x05, 0xa8, 0xb7, 0x61, 0x32, 0xe8, 0x65, + 0x0e, 0x1d, 0xc6, 0x60, 0xd8, 0x55, 0xaa, 0xf0, 0x3a, 0x95, 0x4a, 0x85, 0xe1, 0x31, 0x5c, 0x12, + 0x6c, 0xfe, 0x48, 0xa0, 0xa3, 0x3e, 0xc4, 0xec, 0x92, 0xee, 0xd6, 0x75, 0xba, 0xd4, 0xf0, 0x61, + 0xc8, 0x85, 0xd1, 0x46, 0x4d, 0x8a, 0x96, 0x3e, 0x7a, 0x68, 0x76, 0xab, 0xe8, 0x23, 0x85, 0x11, + 0x87, 0x43, 0xbc, 0x87, 0xea, 0x3a, 0x81, 0xc8, 0xf7, 0x16, 0xbd, 0xe5, 0x99, 0xf5, 0x75, 0xf2, + 0xdd, 0x96, 0x93, 0x09, 0xf5, 0x6e, 0x02, 0x51, 0xfb, 0x8f, 0xa3, 0xd3, 0x85, 0xda, 0xf8, 0x74, + 0xa1, 0x9e, 0x59, 0xd4, 0xd2, 0xf0, 0x4b, 0xd4, 0xd0, 0x86, 0x99, 0x54, 0xfb, 0xbf, 0x59, 0xee, + 0xc6, 0x0d, 0xb9, 0x56, 0xdb, 0xfe, 0xd3, 0x91, 0x1b, 0xb9, 0x4d, 0x1d, 0x73, 0xe9, 0xd3, 0x14, + 0x9a, 0xbb, 0xa2, 0x12, 0xfc, 0x0c, 0xd5, 0x07, 0x5c, 0x74, 0xdd, 0x5d, 0x36, 0xcf, 0x9d, 0x59, + 0xf6, 0x88, 0x24, 0x83, 0x5e, 0xe6, 0xd0, 0x24, 0x7b, 0x42, 0x32, 0x5a, 0x23, 0x0f, 0x95, 0x4c, + 0x93, 0xa7, 0xa0, 0x32, 0xd6, 0x63, 0x2e, 0xba, 0xd5, 0x7d, 0x32, 0x8b, 0x5a, 0x22, 0xde, 0x47, + 0x0d, 0xd9, 0x79, 0x0d, 0x91, 0x71, 0xf7, 0x59, 0xbd, 0x96, 0xed, 0xde, 0x8d, 0x50, 0x76, 0x78, + 0xff, 0x8d, 0x01, 0x91, 0x61, 0xab, 0x8b, 0xec, 0x58, 0x08, 0x75, 0x30, 0xfc, 0x0a, 0xb5, 0xe4, + 0xb0, 0x9b, 0x3b, 0xfd, 0xdf, 0x7f, 0x85, 0xfc, 0xb7, 0x23, 0xb7, 0x76, 0x0a, 0x0e, 0xad, 0x90, + 0xf8, 0x05, 0x6a, 0xc9, 0x24, 0x1b, 0x01, 0x2e, 0x85, 0x5f, 0x5f, 0xf4, 0x96, 0x5b, 0xed, 0x7b, + 0xa5, 0xa0, 0x08, 0x7c, 0x3d, 0x5d, 0x58, 0xae, 0xa6, 0x49, 0x83, 0x1a, 0x81, 0xca, 0x27, 0xbd, + 0x7c, 0xa7, 0x32, 0x97, 0x56, 0x3c, 0xbc, 0x88, 0xea, 0x82, 0xc5, 0xe0, 0x4f, 0x59, 0x6e, 0xd9, + 0xb5, 0x6d, 0x16, 0x03, 0xb5, 0x11, 0x1c, 0xa2, 0x56, 0xf6, 0xab, 0x13, 0x16, 0x81, 0xdf, 0xb0, + 0x69, 0x65, 0xbd, 0xdb, 0x45, 0x80, 0x56, 0x39, 0xb8, 0x8f, 0x9a, 0x0a, 0xb4, 0x4c, 0x55, 0x04, + 0xfe, 0xb4, 0x6d, 0xc7, 0xdd, 0x9b, 0x3f, 0x22, 0x75, 0x84, 0xf6, 0x5f, 0xee, 0xac, 0x66, 0xe1, + 0xa1, 0x25, 0x1d, 0xdf, 0x46, 0x33, 0x3a, 0xed, 0x14, 0x01, 0xbf, 0x69, 0x8b, 0x9b, 0x73, 0x82, + 0x99, 0xdd, 0x2a, 0x44, 0xcf, 0xe7, 0xe1, 0x3d, 0xd4, 0x4c, 0x35, 0xa8, 0x47, 0xe2, 0x40, 0xfa, + 0x2d, 0x5b, 0xe0, 0x7f, 0x17, 0x26, 0xfb, 0xc2, 0x67, 0x25, 0x2b, 0x6c, 0xdf, 0x65, 0x57, 0xc5, + 0x14, 0x1e, 0x5a, 0x92, 0x96, 0x3e, 0x78, 0xe8, 0x9f, 0x2b, 0x37, 0x00, 0xff, 0x8f, 0xa6, 0xd9, + 0x70, 0x28, 0x0f, 0x21, 0x1f, 0xea, 0x66, 0x7b, 0xd6, 0x61, 0xa6, 0xb7, 0x72, 0x37, 0x2d, 0xe2, + 0xf8, 0xc9, 0xc4, 0xca, 0xad, 0xfc, 0x5c, 0xe7, 0xdc, 0xaa, 0xa1, 0x6c, 0x3a, 0x29, 0xe8, 0x74, + 0x68, 0x8a, 0x35, 0x6b, 0x93, 0xa3, 0xb3, 0xa0, 0x76, 0x7c, 0x16, 0xd4, 0x4e, 0xce, 0x82, 0xda, + 0xbb, 0x71, 0xe0, 0x1d, 0x8d, 0x03, 0xef, 0x78, 0x1c, 0x78, 0x27, 0xe3, 0xc0, 0xfb, 0x3c, 0x0e, + 0xbc, 0xf7, 0x5f, 0x82, 0xda, 0xf3, 0x66, 0xb1, 0xc4, 0xdf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x42, + 0x53, 0xac, 0x65, 0xf7, 0x05, 0x00, 0x00, } diff --git a/pkg/apis/admission/v1alpha1/generated.proto b/staging/src/k8s.io/api/admission/v1alpha1/generated.proto similarity index 98% rename from pkg/apis/admission/v1alpha1/generated.proto rename to staging/src/k8s.io/api/admission/v1alpha1/generated.proto index 1b1aa65991c..8859a46fa9c 100644 --- a/pkg/apis/admission/v1alpha1/generated.proto +++ b/staging/src/k8s.io/api/admission/v1alpha1/generated.proto @@ -19,7 +19,7 @@ limitations under the License. syntax = 'proto2'; -package k8s.io.kubernetes.pkg.apis.admission.v1alpha1; +package k8s.io.api.admission.v1alpha1; import "k8s.io/api/authentication/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; diff --git a/staging/src/k8s.io/api/admission/v1alpha1/register.go b/staging/src/k8s.io/api/admission/v1alpha1/register.go new file mode 100644 index 00000000000..ea6d5609af3 --- /dev/null +++ b/staging/src/k8s.io/api/admission/v1alpha1/register.go @@ -0,0 +1,51 @@ +/* +Copyright 2017 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1alpha1 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" +) + +// GroupName is the group name for this API. +const GroupName = "admission.k8s.io" + +// SchemeGroupVersion is group version used to register these objects +var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} + +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + +var ( + // TODO: move SchemeBuilder with zz_generated.deepcopy.go to k8s.io/api. + // localSchemeBuilder and AddToScheme will stay in k8s.io/kubernetes. + SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) + localSchemeBuilder = &SchemeBuilder + AddToScheme = localSchemeBuilder.AddToScheme +) + +// Adds the list of known types to api.Scheme. +func addKnownTypes(scheme *runtime.Scheme) error { + scheme.AddKnownTypes(SchemeGroupVersion, + &AdmissionReview{}, + ) + metav1.AddToGroupVersion(scheme, SchemeGroupVersion) + return nil +} diff --git a/pkg/apis/admission/v1alpha1/types.generated.go b/staging/src/k8s.io/api/admission/v1alpha1/types.generated.go similarity index 100% rename from pkg/apis/admission/v1alpha1/types.generated.go rename to staging/src/k8s.io/api/admission/v1alpha1/types.generated.go diff --git a/pkg/apis/admission/v1alpha1/types.go b/staging/src/k8s.io/api/admission/v1alpha1/types.go similarity index 100% rename from pkg/apis/admission/v1alpha1/types.go rename to staging/src/k8s.io/api/admission/v1alpha1/types.go diff --git a/pkg/apis/admission/v1alpha1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/admission/v1alpha1/types_swagger_doc_generated.go similarity index 100% rename from pkg/apis/admission/v1alpha1/types_swagger_doc_generated.go rename to staging/src/k8s.io/api/admission/v1alpha1/types_swagger_doc_generated.go diff --git a/pkg/apis/admission/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/api/admission/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/admission/v1alpha1/zz_generated.deepcopy.go rename to staging/src/k8s.io/api/admission/v1alpha1/zz_generated.deepcopy.go