Add back openapi gen for generic types and clean up doc.go

kubernetes · Oct 16, 2020 · 0d20022 · 0d20022
1 parent 1dff024
commit 0d20022
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"