Skip to content

Commit ae8ce0d

Browse files
cici37cici37
committed
Move cmd/controller-manager to k8s.io/controller-manager and cloud specific configs to k8s.io/cloud-provider.
1 parent a1441b2 commit ae8ce0d

File tree

102 files changed

+2220
-1053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2220
-1053
lines changed

‎api/api-rules/violation_exceptions.list‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,6 @@ API rule violation: list_type_missing,k8s.io/apiserver/pkg/apis/audit/v1beta1,Po
369369
API rule violation: list_type_missing,k8s.io/apiserver/pkg/apis/audit/v1beta1,PolicyRule,Users
370370
API rule violation: list_type_missing,k8s.io/apiserver/pkg/apis/audit/v1beta1,PolicyRule,Verbs
371371
API rule violation: list_type_missing,k8s.io/kube-controller-manager/config/v1alpha1,GarbageCollectorControllerConfiguration,GCIgnoredResources
372-
API rule violation: list_type_missing,k8s.io/kube-controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,Controllers
373372
API rule violation: list_type_missing,k8s.io/kube-controller-manager/config/v1alpha1,PersistentVolumeBinderControllerConfiguration,VolumeHostCIDRDenylist
374373
API rule violation: list_type_missing,k8s.io/kube-proxy/config/v1alpha1,KubeProxyConfiguration,NodePortAddresses
375374
API rule violation: list_type_missing,k8s.io/kube-proxy/config/v1alpha1,KubeProxyIPVSConfiguration,ExcludeCIDRs
@@ -467,6 +466,24 @@ API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,Raw
467466
API rule violation: names_match,k8s.io/apimachinery/pkg/util/intstr,IntOrString,IntVal
468467
API rule violation: names_match,k8s.io/apimachinery/pkg/util/intstr,IntOrString,StrVal
469468
API rule violation: names_match,k8s.io/apimachinery/pkg/util/intstr,IntOrString,Type
469+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,CloudControllerManagerConfiguration,Generic
470+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,CloudControllerManagerConfiguration,KubeCloudShared
471+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,CloudControllerManagerConfiguration,NodeStatusUpdateFrequency
472+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,CloudControllerManagerConfiguration,ServiceController
473+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,CloudProviderConfiguration,CloudConfigFile
474+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,CloudProviderConfiguration,Name
475+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,AllocateNodeCIDRs
476+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,AllowUntaggedCloud
477+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,CIDRAllocatorType
478+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,CloudProvider
479+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,ClusterCIDR
480+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,ClusterName
481+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,ConfigureCloudRoutes
482+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,ExternalCloudVolumePlugin
483+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,NodeMonitorPeriod
484+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,NodeSyncPeriod
485+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,RouteReconciliationPeriod
486+
API rule violation: names_match,k8s.io/cloud-provider/app/apis/config/v1alpha1,KubeCloudSharedConfiguration,UseServiceAccountCredentials
470487
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,AttachDetachControllerConfiguration,DisableAttachDetachReconcilerSync
471488
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,AttachDetachControllerConfiguration,ReconcilerSyncLoopPeriod
472489
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,CSRSigningConfiguration,CertFile
@@ -478,8 +495,6 @@ API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,C
478495
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,CSRSigningControllerConfiguration,KubeletClientSignerConfiguration
479496
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,CSRSigningControllerConfiguration,KubeletServingSignerConfiguration
480497
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,CSRSigningControllerConfiguration,LegacyUnknownSignerConfiguration
481-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,CloudProviderConfiguration,CloudConfigFile
482-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,CloudProviderConfiguration,Name
483498
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,DaemonSetControllerConfiguration,ConcurrentDaemonSetSyncs
484499
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,DeploymentControllerConfiguration,ConcurrentDeploymentSyncs
485500
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,DeploymentControllerConfiguration,DeploymentControllerSyncPeriod
@@ -497,14 +512,6 @@ API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,E
497512
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GarbageCollectorControllerConfiguration,ConcurrentGCSyncs
498513
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GarbageCollectorControllerConfiguration,EnableGarbageCollector
499514
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GarbageCollectorControllerConfiguration,GCIgnoredResources
500-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,Address
501-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,ClientConnection
502-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,ControllerStartInterval
503-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,Controllers
504-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,Debugging
505-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,LeaderElection
506-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,MinResyncPeriod
507-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,Port
508515
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GroupResource,Group
509516
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,GroupResource,Resource
510517
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,HPAControllerConfiguration,HorizontalPodAutoscalerCPUInitializationPeriod
@@ -516,18 +523,6 @@ API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,H
516523
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,HPAControllerConfiguration,HorizontalPodAutoscalerUpscaleForbiddenWindow
517524
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,HPAControllerConfiguration,HorizontalPodAutoscalerUseRESTClients
518525
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,JobControllerConfiguration,ConcurrentJobSyncs
519-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeCloudSharedConfiguration,AllocateNodeCIDRs
520-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeCloudSharedConfiguration,AllowUntaggedCloud
521-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeCloudSharedConfiguration,CIDRAllocatorType
522-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeCloudSharedConfiguration,CloudProvider
523-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeCloudSharedConfiguration,ClusterCIDR
524-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeCloudSharedConfiguration,ClusterName
525-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeCloudSharedConfiguration,ConfigureCloudRoutes
526-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeCloudSharedConfiguration,ExternalCloudVolumePlugin
527-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeCloudSharedConfiguration,NodeMonitorPeriod
528-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeCloudSharedConfiguration,NodeSyncPeriod
529-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeCloudSharedConfiguration,RouteReconciliationPeriod
530-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeCloudSharedConfiguration,UseServiceAccountCredentials
531526
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeControllerManagerConfiguration,AttachDetachController
532527
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeControllerManagerConfiguration,CSRSigningController
533528
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,KubeControllerManagerConfiguration,DaemonSetController
@@ -587,7 +582,6 @@ API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,R
587582
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,SAControllerConfiguration,ConcurrentSATokenSyncs
588583
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,SAControllerConfiguration,RootCAFile
589584
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,SAControllerConfiguration,ServiceAccountKeyFile
590-
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,ServiceControllerConfiguration,ConcurrentServiceSyncs
591585
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,StatefulSetControllerConfiguration,ConcurrentStatefulSetSyncs
592586
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,TTLAfterFinishedControllerConfiguration,ConcurrentTTLSyncs
593587
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,VolumeConfiguration,EnableDynamicProvisioning
@@ -599,9 +593,5 @@ API rule violation: names_match,k8s.io/kube-scheduler/config/v1,LegacyExtender,E
599593
API rule violation: names_match,k8s.io/kubelet/config/v1beta1,KubeletConfiguration,IPTablesDropBit
600594
API rule violation: names_match,k8s.io/kubelet/config/v1beta1,KubeletConfiguration,IPTablesMasqueradeBit
601595
API rule violation: names_match,k8s.io/kubelet/config/v1beta1,KubeletConfiguration,ResolverConfig
602-
API rule violation: names_match,k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/v1alpha1,CloudControllerManagerConfiguration,Generic
603-
API rule violation: names_match,k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/v1alpha1,CloudControllerManagerConfiguration,KubeCloudShared
604-
API rule violation: names_match,k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/v1alpha1,CloudControllerManagerConfiguration,NodeStatusUpdateFrequency
605-
API rule violation: names_match,k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/v1alpha1,CloudControllerManagerConfiguration,ServiceController
606596
API rule violation: names_match,k8s.io/metrics/pkg/apis/custom_metrics/v1beta1,MetricValue,WindowSeconds
607597
API rule violation: names_match,k8s.io/metrics/pkg/apis/external_metrics/v1beta1,ExternalMetricValue,WindowSeconds

‎build/kazel_generated.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ tags_values_pkgs = {"openapi-gen": {
3535
"staging/src/k8s.io/apiserver/pkg/apis/example2/v1",
3636
],
3737
"true": [
38-
"cmd/cloud-controller-manager/app/apis/config/v1alpha1",
3938
"pkg/apis/abac/v0",
4039
"pkg/apis/abac/v1beta1",
4140
"staging/src/k8s.io/api/admissionregistration/v1",
@@ -94,6 +93,7 @@ tags_values_pkgs = {"openapi-gen": {
9493
"staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1",
9594
"staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1",
9695
"staging/src/k8s.io/client-go/pkg/version",
96+
"staging/src/k8s.io/cloud-provider/app/apis/config/v1alpha1",
9797
"staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1",
9898
"staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1",
9999
"staging/src/k8s.io/kube-controller-manager/config/v1alpha1",
@@ -113,7 +113,6 @@ tags_values_pkgs = {"openapi-gen": {
113113

114114
# tags_pkgs_values is a dictionary mapping {k8s build tag: {pkg: [tag values in pkg]}}
115115
tags_pkgs_values = {"openapi-gen": {
116-
"cmd/cloud-controller-manager/app/apis/config/v1alpha1": ["true"],
117116
"pkg/apis/abac/v0": ["true"],
118117
"pkg/apis/abac/v1beta1": ["true"],
119118
"staging/src/k8s.io/api/admission/v1": ["false"],
@@ -180,6 +179,7 @@ tags_pkgs_values = {"openapi-gen": {
180179
"staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1": ["true"],
181180
"staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1": ["true"],
182181
"staging/src/k8s.io/client-go/pkg/version": ["true"],
182+
"staging/src/k8s.io/cloud-provider/app/apis/config/v1alpha1": ["true"],
183183
"staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1": ["true"],
184184
"staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1": ["true"],
185185
"staging/src/k8s.io/kube-controller-manager/config/v1alpha1": ["true"],

‎cmd/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ filegroup(
1313
":package-srcs",
1414
"//cmd/clicheck:all-srcs",
1515
"//cmd/cloud-controller-manager:all-srcs",
16-
"//cmd/controller-manager/app:all-srcs",
1716
"//cmd/dependencycheck:all-srcs",
1817
"//cmd/gendocs:all-srcs",
1918
"//cmd/genkubedocs:all-srcs",

‎cmd/cloud-controller-manager/.import-restrictions‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ rules:
77
- k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/v1alpha1
88
- k8s.io/kubernetes/cmd/cloud-controller-manager/app/config
99
- k8s.io/kubernetes/cmd/cloud-controller-manager/app/options
10-
- k8s.io/kubernetes/cmd/controller-manager/app
11-
- k8s.io/kubernetes/cmd/controller-manager/app/options
1210
- k8s.io/kubernetes/pkg/api/legacyscheme
1311
- k8s.io/kubernetes/pkg/api/service
1412
- k8s.io/kubernetes/pkg/api/v1/pod
@@ -26,8 +24,6 @@ rules:
2624
- k8s.io/kubernetes/pkg/client/leaderelectionconfig
2725
- k8s.io/kubernetes/pkg/cloudprovider/providers
2826
- k8s.io/kubernetes/pkg/controller
29-
- k8s.io/kubernetes/pkg/controller/apis/config
30-
- k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1
3127
- k8s.io/kubernetes/pkg/controller/certificates/signer/config
3228
- k8s.io/kubernetes/pkg/controller/certificates/signer/config/v1alpha1
3329
- k8s.io/kubernetes/pkg/controller/cloud
@@ -63,8 +59,6 @@ rules:
6359
- k8s.io/kubernetes/pkg/controller/resourcequota/config/v1alpha1
6460
- k8s.io/kubernetes/pkg/controller/route
6561
- k8s.io/kubernetes/pkg/controller/service
66-
- k8s.io/kubernetes/pkg/controller/service/config
67-
- k8s.io/kubernetes/pkg/controller/service/config/v1alpha1
6862
- k8s.io/kubernetes/pkg/controller/serviceaccount/config
6963
- k8s.io/kubernetes/pkg/controller/serviceaccount/config/v1alpha1
7064
- k8s.io/kubernetes/pkg/controller/statefulset/config

‎cmd/cloud-controller-manager/app/BUILD‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ go_library(
1111
deps = [
1212
"//cmd/cloud-controller-manager/app/config:go_default_library",
1313
"//cmd/cloud-controller-manager/app/options:go_default_library",
14-
"//cmd/controller-manager/app:go_default_library",
1514
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
1615
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
1716
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
@@ -31,6 +30,7 @@ go_library(
3130
"//staging/src/k8s.io/component-base/term:go_default_library",
3231
"//staging/src/k8s.io/component-base/version:go_default_library",
3332
"//staging/src/k8s.io/component-base/version/verflag:go_default_library",
33+
"//staging/src/k8s.io/controller-manager/app:go_default_library",
3434
"//vendor/github.com/spf13/cobra:go_default_library",
3535
"//vendor/k8s.io/klog/v2:go_default_library",
3636
"//vendor/k8s.io/utils/net:go_default_library",
@@ -48,7 +48,6 @@ filegroup(
4848
name = "all-srcs",
4949
srcs = [
5050
":package-srcs",
51-
"//cmd/cloud-controller-manager/app/apis/config:all-srcs",
5251
"//cmd/cloud-controller-manager/app/config:all-srcs",
5352
"//cmd/cloud-controller-manager/app/options:all-srcs",
5453
"//cmd/cloud-controller-manager/app/testing:all-srcs",

‎cmd/cloud-controller-manager/app/apis/config/types.go‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎cmd/cloud-controller-manager/app/apis/config/v1alpha1/types.go‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)