From 096f32d1b3eb69b33041ae11d4cef89a30aef6c8 Mon Sep 17 00:00:00 2001 From: Haowei Cai Date: Tue, 21 Jul 2020 10:37:32 -0700 Subject: [PATCH] update doc.go and register.go --- pkg/apis/apiserverinternal/doc.go | 2 +- pkg/apis/apiserverinternal/v1alpha1/doc.go | 26 +++++++++++ .../apiserverinternal/v1alpha1/register.go | 46 +++++++++++++++++++ .../api/apiserverinternal/v1alpha1/doc.go | 4 +- .../apiserverinternal/v1alpha1/register.go | 12 +---- 5 files changed, 76 insertions(+), 14 deletions(-) create mode 100644 pkg/apis/apiserverinternal/v1alpha1/doc.go create mode 100644 pkg/apis/apiserverinternal/v1alpha1/register.go diff --git a/pkg/apis/apiserverinternal/doc.go b/pkg/apis/apiserverinternal/doc.go index df3193a924a..f26f5175eb0 100644 --- a/pkg/apis/apiserverinternal/doc.go +++ b/pkg/apis/apiserverinternal/doc.go @@ -19,4 +19,4 @@ limitations under the License. // Package apiserverinternal contains the "internal" version of the API used by // the apiservers themselves. -package apiserverinternal // import "k8s.io/apiserver/pkg/apis/apiserverinternal" +package apiserverinternal // import "k8s.io/kubernetes/pkg/apis/apiserverinternal" diff --git a/pkg/apis/apiserverinternal/v1alpha1/doc.go b/pkg/apis/apiserverinternal/v1alpha1/doc.go new file mode 100644 index 00000000000..d9124cf1b7a --- /dev/null +++ b/pkg/apis/apiserverinternal/v1alpha1/doc.go @@ -0,0 +1,26 @@ +/* +Copyright 2020 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:conversion-gen=k8s.io/kubernetes/pkg/apis/apiserverinternal +// +k8s:conversion-gen-external-types=k8s.io/api/apiserverinternal/v1alpha1 +// +k8s:defaulter-gen=TypeMeta +// +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/apiserverinternal/v1alpha1 + +// +groupName=internal.apiserver.k8s.io + +// Package v1alpha1 contains the v1alpha1 version of the API used by the +// apiservers themselves. +package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/apiserverinternal/v1alpha1" diff --git a/pkg/apis/apiserverinternal/v1alpha1/register.go b/pkg/apis/apiserverinternal/v1alpha1/register.go new file mode 100644 index 00000000000..b63a549eab2 --- /dev/null +++ b/pkg/apis/apiserverinternal/v1alpha1/register.go @@ -0,0 +1,46 @@ +/* +Copyright 2020 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 ( + apiserverinternalv1alpha1 "k8s.io/api/apiserverinternal/v1alpha1" + "k8s.io/apimachinery/pkg/runtime/schema" +) + +// GroupName is the group name use in this package +const GroupName = "internal.apiserver.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 ( + localSchemeBuilder = &apiserverinternalv1alpha1.SchemeBuilder + // AddToScheme adds api to a scheme + AddToScheme = localSchemeBuilder.AddToScheme +) + +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(RegisterDefaults) +} diff --git a/staging/src/k8s.io/api/apiserverinternal/v1alpha1/doc.go b/staging/src/k8s.io/api/apiserverinternal/v1alpha1/doc.go index 9e8ec0cfc5d..a4da95d44d2 100644 --- a/staging/src/k8s.io/api/apiserverinternal/v1alpha1/doc.go +++ b/staging/src/k8s.io/api/apiserverinternal/v1alpha1/doc.go @@ -16,12 +16,10 @@ limitations under the License. // +k8s:deepcopy-gen=package // +k8s:protobuf-gen=package -// +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/apiserverinternal // +k8s:openapi-gen=true -// +k8s:defaulter-gen=TypeMeta // +groupName=internal.apiserver.k8s.io // Package v1alpha1 contains the v1alpha1 version of the API used by the // apiservers themselves. -package v1alpha1 // import "k8s.io/apiserver/pkg/apis/apiserverinternal/v1alpha1" +package v1alpha1 // import "k8s.io/api/apiserverinternal/v1alpha1" diff --git a/staging/src/k8s.io/api/apiserverinternal/v1alpha1/register.go b/staging/src/k8s.io/api/apiserverinternal/v1alpha1/register.go index e510140fa83..5e46e8d9a77 100644 --- a/staging/src/k8s.io/api/apiserverinternal/v1alpha1/register.go +++ b/staging/src/k8s.io/api/apiserverinternal/v1alpha1/register.go @@ -34,18 +34,10 @@ func Resource(resource string) schema.GroupResource { } var ( - SchemeBuilder runtime.SchemeBuilder - localSchemeBuilder = &SchemeBuilder - AddToScheme = localSchemeBuilder.AddToScheme + SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) + AddToScheme = SchemeBuilder.AddToScheme ) -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) -} - func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &StorageVersion{},