From 0d2002229f176563802191100356f2ffb6aaf19d Mon Sep 17 00:00:00 2001 From: cici37 Date: Tue, 13 Oct 2020 10:32:18 -0700 Subject: [PATCH] Add back openapi gen for generic types and clean up doc.go --- api/api-rules/violation_exceptions.list | 10 ++++++++++ build/kazel_generated.bzl | 2 ++ pkg/controller/apis/config/v1alpha1/doc.go | 3 --- .../k8s.io/controller-manager/config/v1alpha1/doc.go | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list index cfe891e4ab7..6f9110e99c9 100644 --- a/api/api-rules/violation_exceptions.list +++ b/api/api-rules/violation_exceptions.list @@ -368,6 +368,8 @@ API rule violation: list_type_missing,k8s.io/apiserver/pkg/apis/audit/v1beta1,Po API rule violation: list_type_missing,k8s.io/apiserver/pkg/apis/audit/v1beta1,PolicyRule,UserGroups API rule violation: list_type_missing,k8s.io/apiserver/pkg/apis/audit/v1beta1,PolicyRule,Users API rule violation: list_type_missing,k8s.io/apiserver/pkg/apis/audit/v1beta1,PolicyRule,Verbs +API rule violation: list_type_missing,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,Controllers +API rule violation: list_type_missing,k8s.io/controller-manager/config/v1alpha1,LeaderMigrationConfiguration,ControllerLeaders API rule violation: list_type_missing,k8s.io/kube-controller-manager/config/v1alpha1,GarbageCollectorControllerConfiguration,GCIgnoredResources API rule violation: list_type_missing,k8s.io/kube-controller-manager/config/v1alpha1,PersistentVolumeBinderControllerConfiguration,VolumeHostCIDRDenylist API rule violation: list_type_missing,k8s.io/kube-proxy/config/v1alpha1,KubeProxyConfiguration,NodePortAddresses @@ -484,6 +486,14 @@ API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,K API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,NodeSyncPeriod API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,RouteReconciliationPeriod API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,UseServiceAccountCredentials +API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,Address +API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,ClientConnection +API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,ControllerStartInterval +API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,Controllers +API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,Debugging +API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,LeaderElection +API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,MinResyncPeriod +API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,Port API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,AttachDetachControllerConfiguration,DisableAttachDetachReconcilerSync API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,AttachDetachControllerConfiguration,ReconcilerSyncLoopPeriod API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,CSRSigningConfiguration,CertFile diff --git a/build/kazel_generated.bzl b/build/kazel_generated.bzl index 6197ae682b8..6803a06fc67 100644 --- a/build/kazel_generated.bzl +++ b/build/kazel_generated.bzl @@ -94,6 +94,7 @@ tags_values_pkgs = {"openapi-gen": { "staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1", "staging/src/k8s.io/client-go/pkg/version", "staging/src/k8s.io/cloud-provider/app/apis/config/v1alpha1", + "staging/src/k8s.io/controller-manager/config/v1alpha1", "staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1", "staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1", "staging/src/k8s.io/kube-controller-manager/config/v1alpha1", @@ -180,6 +181,7 @@ tags_pkgs_values = {"openapi-gen": { "staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1": ["true"], "staging/src/k8s.io/client-go/pkg/version": ["true"], "staging/src/k8s.io/cloud-provider/app/apis/config/v1alpha1": ["true"], + "staging/src/k8s.io/controller-manager/config/v1alpha1": ["true"], "staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1": ["true"], "staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1": ["true"], "staging/src/k8s.io/kube-controller-manager/config/v1alpha1": ["true"], diff --git a/pkg/controller/apis/config/v1alpha1/doc.go b/pkg/controller/apis/config/v1alpha1/doc.go index 6c4dfca1081..c3c238efec3 100644 --- a/pkg/controller/apis/config/v1alpha1/doc.go +++ b/pkg/controller/apis/config/v1alpha1/doc.go @@ -17,11 +17,8 @@ limitations under the License. // +k8s:deepcopy-gen=package // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/apis/config // +k8s:conversion-gen=k8s.io/component-base/config/v1alpha1 -// +k8s:conversion-gen=k8s.io/cloud-provider/app/apis/config // +k8s:conversion-gen=k8s.io/cloud-provider/app/apis/config/v1alpha1 -// +k8s:conversion-gen=k8s.io/cloud-provider/service/config // +k8s:conversion-gen=k8s.io/cloud-provider/service/config/v1alpha1 -// +k8s:conversion-gen=k8s.io/controller-manager/config // +k8s:conversion-gen=k8s.io/controller-manager/config/v1alpha1 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/certificates/signer/config/v1alpha1 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/daemon/config/v1alpha1 diff --git a/staging/src/k8s.io/controller-manager/config/v1alpha1/doc.go b/staging/src/k8s.io/controller-manager/config/v1alpha1/doc.go index 3df23ab0aad..b01cf385ddd 100644 --- a/staging/src/k8s.io/controller-manager/config/v1alpha1/doc.go +++ b/staging/src/k8s.io/controller-manager/config/v1alpha1/doc.go @@ -17,6 +17,7 @@ limitations under the License. // +k8s:deepcopy-gen=package // +k8s:conversion-gen=k8s.io/controller-manager/config // +k8s:conversion-gen=k8s.io/controller-manager/config/v1alpha1 +// +k8s:openapi-gen=true // +groupName=controllermanager.config.k8s.io package v1alpha1 // import "k8s.io/controller-manager/config/v1alpha1"