From 56cd8ecf083f8da2d8b76294d877dc42098642b9 Mon Sep 17 00:00:00 2001 From: Han Kang Date: Wed, 10 Oct 2018 14:51:13 -0700 Subject: [PATCH] fix lint issues in the apis/abac directory (except latest.go) --- hack/.golint_failures | 3 --- pkg/apis/abac/register.go | 7 +++++-- pkg/apis/abac/v0/register.go | 11 ++++++++--- pkg/apis/abac/v0/types.go | 1 + pkg/apis/abac/v1beta1/register.go | 9 +++++++-- pkg/apis/abac/v1beta1/types.go | 1 + 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index a6828f028bd..95ed3b54cbb 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -13,10 +13,7 @@ cmd/kubeadm/app/util/system cmd/kubelet/app cmd/kubelet/app/options cmd/kubemark -pkg/apis/abac pkg/apis/abac/latest -pkg/apis/abac/v0 -pkg/apis/abac/v1beta1 pkg/apis/admission pkg/apis/admission/v1beta1 pkg/apis/admissionregistration diff --git a/pkg/apis/abac/register.go b/pkg/apis/abac/register.go index fdf3d31d0bb..8dacb58035a 100644 --- a/pkg/apis/abac/register.go +++ b/pkg/apis/abac/register.go @@ -22,9 +22,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer" ) -// Group is the API group for abac +// GroupName is the API group for abac const GroupName = "abac.authorization.kubernetes.io" +// SchemeGroupVersion is the API group version used to register abac internal var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} // Scheme is the default instance of runtime.Scheme to which types in the abac API group are api.Registry. @@ -40,8 +41,10 @@ func init() { } var ( + // SchemeBuilder is the scheme builder with scheme init functions to run for this API package SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) - AddToScheme = SchemeBuilder.AddToScheme + // AddToScheme is a common registration function for mapping packaged scoped group & version keys to a scheme + AddToScheme = SchemeBuilder.AddToScheme ) func addKnownTypes(scheme *runtime.Scheme) error { diff --git a/pkg/apis/abac/v0/register.go b/pkg/apis/abac/v0/register.go index 9a5aa984549..2138396f84b 100644 --- a/pkg/apis/abac/v0/register.go +++ b/pkg/apis/abac/v0/register.go @@ -22,9 +22,10 @@ import ( "k8s.io/kubernetes/pkg/apis/abac" ) +// GroupName is the group name use in this package const GroupName = "abac.authorization.kubernetes.io" -// GroupVersion is the API group and version for abac v0 +// SchemeGroupVersion is the API group version used to register abac v0 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v0"} func init() { @@ -40,11 +41,15 @@ func init() { } var ( + // SchemeBuilder is the scheme builder with scheme init functions to run for this API package // TODO: move SchemeBuilder with zz_generated.deepcopy.go to k8s.io/api. + SchemeBuilder runtime.SchemeBuilder + // localSchemeBuilder ïs a pointer to SchemeBuilder instance. Using localSchemeBuilder + // defaulting and conversion init funcs are registered as well. // localSchemeBuilder and AddToScheme will stay in k8s.io/kubernetes. - SchemeBuilder runtime.SchemeBuilder localSchemeBuilder = &SchemeBuilder - AddToScheme = localSchemeBuilder.AddToScheme + // AddToScheme is a common registration function for mapping packaged scoped group & version keys to a scheme + AddToScheme = localSchemeBuilder.AddToScheme ) func init() { diff --git a/pkg/apis/abac/v0/types.go b/pkg/apis/abac/v0/types.go index b6b0af1ad59..3ebf30fea61 100644 --- a/pkg/apis/abac/v0/types.go +++ b/pkg/apis/abac/v0/types.go @@ -15,6 +15,7 @@ limitations under the License. */ // +k8s:openapi-gen=true + package v0 import ( diff --git a/pkg/apis/abac/v1beta1/register.go b/pkg/apis/abac/v1beta1/register.go index a7fc1158ea0..9132934eafd 100644 --- a/pkg/apis/abac/v1beta1/register.go +++ b/pkg/apis/abac/v1beta1/register.go @@ -22,6 +22,7 @@ import ( "k8s.io/kubernetes/pkg/apis/abac" ) +// GroupName is the group name use in this package const GroupName = "abac.authorization.kubernetes.io" // SchemeGroupVersion is the API group and version for abac v1beta1 @@ -40,11 +41,15 @@ func init() { } var ( + // SchemeBuilder is the scheme builder with scheme init functions to run for this API package // TODO: move SchemeBuilder with zz_generated.deepcopy.go to k8s.io/api. + SchemeBuilder runtime.SchemeBuilder + // localSchemeBuilder ïs a pointer to SchemeBuilder instance. Using localSchemeBuilder + // defaulting and conversion init funcs are registered as well. // localSchemeBuilder and AddToScheme will stay in k8s.io/kubernetes. - SchemeBuilder runtime.SchemeBuilder localSchemeBuilder = &SchemeBuilder - AddToScheme = localSchemeBuilder.AddToScheme + // AddToScheme is a common registration function for mapping packaged scoped group & version keys to a scheme + AddToScheme = localSchemeBuilder.AddToScheme ) func init() { diff --git a/pkg/apis/abac/v1beta1/types.go b/pkg/apis/abac/v1beta1/types.go index 21a3133f21f..6e7c7239c36 100644 --- a/pkg/apis/abac/v1beta1/types.go +++ b/pkg/apis/abac/v1beta1/types.go @@ -15,6 +15,7 @@ limitations under the License. */ // +k8s:openapi-gen=true + package v1beta1 import (