Merge pull request #64142 from stewart-yu/stewart-cleancontroller#02

Automatic merge from submit-queue (batch tested with PRs 64142, 64426, 62910, 63942, 64548). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. move specific option sub-struct from controller-manager into kube-controller manager packages **What this PR does / why we need it**: As follow-up [PR](https://github.com/kubernetes/kubernetes/pull/63283), in case of it too big to review. Move specific option sub-struct from `controller-manager` into `kube-controller manager` packages, which only used by `kube-controller manager` **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: /assign @sttts @deads2k /cc @hzxuzhonghu /hold just for the finally two commit, will rebase commit after [PR.](https://github.com/kubernetes/kubernetes/pull/63283) get merged. **Release note**: ```release-note NONE ```

Merge pull request #64142 from stewart-yu/stewart-cleancontroller#02
457ed732 · Kubernetes Submit Queue · GitHub · 53d03c58 · 440a6166 · 457ed732
Unverified Commit 457ed732 authored Jun 20, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 20, 2018
30 changed files
--- a/cmd/controller-manager/app/options/BUILD
+++ b/cmd/controller-manager/app/options/BUILD
@@ -3,29 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
    name = "go_default_library",
    srcs = [
-        "attachdetachcontroller.go",
        "cloudprovider.go",
-        "csrsigningcontroller.go",
-        "daemonsetcontroller.go",
        "debugging.go",
-        "deploymentcontroller.go",
-        "deprecatedcontroller.go",
-        "endpointcontroller.go",
-        "garbagecollectorcontroller.go",
        "generic.go",
-        "hpacontroller.go",
        "insecure_serving.go",
-        "jobcontroller.go",
        "kubecloudshared.go",
-        "namespacecontroller.go",
-        "nodeipamcontroller.go",
-        "nodelifecyclecontroller.go",
-        "persistentvolumebindercontroller.go",
-        "podgccontroller.go",
-        "replicasetcontroller.go",
-        "replicationcontroller.go",
-        "resourcequotacontroller.go",
-        "serviceaccountcontroller.go",
        "servicecontroller.go",
    ],
    importpath = "k8s.io/kubernetes/cmd/controller-manager/app/options",

--- a/cmd/controller-manager/app/options/cloudprovider.go
+++ b/cmd/controller-manager/app/options/cloudprovider.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )


--- a/cmd/controller-manager/app/options/debugging.go
+++ b/cmd/controller-manager/app/options/debugging.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )


--- a/cmd/controller-manager/app/options/generic.go
+++ b/cmd/controller-manager/app/options/generic.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 	"k8s.io/kubernetes/pkg/client/leaderelectionconfig"

--- a/cmd/controller-manager/app/options/insecure_serving.go
+++ b/cmd/controller-manager/app/options/insecure_serving.go
@@ -21,6 +21,7 @@ import (
 	"net"

 	"github.com/spf13/pflag"
+
 	"k8s.io/apiserver/pkg/server/options"
 	genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app"
 )

--- a/cmd/controller-manager/app/options/kubecloudshared.go
+++ b/cmd/controller-manager/app/options/kubecloudshared.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )

--- a/cmd/controller-manager/app/options/servicecontroller.go
+++ b/cmd/controller-manager/app/options/servicecontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )


--- a/cmd/kube-controller-manager/app/BUILD
+++ b/cmd/kube-controller-manager/app/BUILD
@@ -20,7 +20,6 @@ go_library(
    visibility = ["//visibility:public"],
    deps = [
        "//cmd/controller-manager/app:go_default_library",
-        "//cmd/controller-manager/app/options:go_default_library",
        "//cmd/kube-controller-manager/app/config:go_default_library",
        "//cmd/kube-controller-manager/app/options:go_default_library",
        "//pkg/apis/apps/install:go_default_library",

--- a/cmd/kube-controller-manager/app/certificates.go
+++ b/cmd/kube-controller-manager/app/certificates.go
@@ -27,7 +27,7 @@ import (
 	"github.com/golang/glog"

 	"k8s.io/apimachinery/pkg/runtime/schema"
-	cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
+	kubeoptions "k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
 	"k8s.io/kubernetes/pkg/controller/certificates/approver"
 	"k8s.io/kubernetes/pkg/controller/certificates/cleaner"
 	"k8s.io/kubernetes/pkg/controller/certificates/signer"
@@ -55,12 +55,12 @@ func startCSRSigningController(ctx ControllerContext) (bool, error) {
 	_, err := os.Stat(ctx.ComponentConfig.CSRSigningController.ClusterSigningCertFile)
 	certFileExists = !os.IsNotExist(err)

-	certUsesDefault = (ctx.ComponentConfig.CSRSigningController.ClusterSigningCertFile == cmoptions.DefaultClusterSigningCertFile)
+	certUsesDefault = (ctx.ComponentConfig.CSRSigningController.ClusterSigningCertFile == kubeoptions.DefaultClusterSigningCertFile)

 	_, err = os.Stat(ctx.ComponentConfig.CSRSigningController.ClusterSigningKeyFile)
 	keyFileExists = !os.IsNotExist(err)

-	keyUsesDefault = (ctx.ComponentConfig.CSRSigningController.ClusterSigningKeyFile == cmoptions.DefaultClusterSigningKeyFile)
+	keyUsesDefault = (ctx.ComponentConfig.CSRSigningController.ClusterSigningKeyFile == kubeoptions.DefaultClusterSigningKeyFile)

 	switch {
 	case (keyFileExists && keyUsesDefault) || (certFileExists && certUsesDefault):

--- a/cmd/kube-controller-manager/app/options/BUILD
+++ b/cmd/kube-controller-manager/app/options/BUILD
@@ -8,7 +8,27 @@ load(

 go_library(
    name = "go_default_library",
-    srcs = ["options.go"],
+    srcs = [
+        "attachdetachcontroller.go",
+        "csrsigningcontroller.go",
+        "daemonsetcontroller.go",
+        "deploymentcontroller.go",
+        "deprecatedcontroller.go",
+        "endpointcontroller.go",
+        "garbagecollectorcontroller.go",
+        "hpacontroller.go",
+        "jobcontroller.go",
+        "namespacecontroller.go",
+        "nodeipamcontroller.go",
+        "nodelifecyclecontroller.go",
+        "options.go",
+        "persistentvolumebindercontroller.go",
+        "podgccontroller.go",
+        "replicasetcontroller.go",
+        "replicationcontroller.go",
+        "resourcequotacontroller.go",
+        "serviceaccountcontroller.go",
+    ],
    importpath = "k8s.io/kubernetes/cmd/kube-controller-manager/app/options",
    deps = [
        "//cmd/controller-manager/app/options:go_default_library",
@@ -22,6 +42,7 @@ go_library(
        "//vendor/github.com/golang/glog:go_default_library",
        "//vendor/github.com/spf13/pflag:go_default_library",
        "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",

--- a/cmd/controller-manager/app/options/attachdetachcontroller.go
+++ b/cmd/controller-manager/app/options/attachdetachcontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )

--- a/cmd/controller-manager/app/options/csrsigningcontroller.go
+++ b/cmd/controller-manager/app/options/csrsigningcontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )

--- a/cmd/controller-manager/app/options/daemonsetcontroller.go
+++ b/cmd/controller-manager/app/options/daemonsetcontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )


--- a/cmd/controller-manager/app/options/deploymentcontroller.go
+++ b/cmd/controller-manager/app/options/deploymentcontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )

--- a/cmd/controller-manager/app/options/deprecatedcontroller.go
+++ b/cmd/controller-manager/app/options/deprecatedcontroller.go
@@ -18,10 +18,12 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )

 // DeprecatedControllerOptions holds the DeprecatedController options, those option are deprecated.
+// TODO remove these fields once the deprecated flags are removed.
 type DeprecatedControllerOptions struct {
 	DeletingPodsQPS    float32
 	DeletingPodsBurst  int32

--- a/cmd/controller-manager/app/options/endpointcontroller.go
+++ b/cmd/controller-manager/app/options/endpointcontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )


--- a/cmd/controller-manager/app/options/garbagecollectorcontroller.go
+++ b/cmd/controller-manager/app/options/garbagecollectorcontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )


--- a/cmd/controller-manager/app/options/hpacontroller.go
+++ b/cmd/controller-manager/app/options/hpacontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )

--- a/cmd/controller-manager/app/options/jobcontroller.go
+++ b/cmd/controller-manager/app/options/jobcontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )


--- a/cmd/controller-manager/app/options/namespacecontroller.go
+++ b/cmd/controller-manager/app/options/namespacecontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )

--- a/cmd/controller-manager/app/options/nodeipamcontroller.go
+++ b/cmd/controller-manager/app/options/nodeipamcontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )


--- a/cmd/controller-manager/app/options/nodelifecyclecontroller.go
+++ b/cmd/controller-manager/app/options/nodelifecyclecontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )

--- a/cmd/kube-controller-manager/app/options/options.go
+++ b/cmd/kube-controller-manager/app/options/options.go
--- a/cmd/kube-controller-manager/app/options/options_test.go
+++ b/cmd/kube-controller-manager/app/options/options_test.go
@@ -150,30 +150,30 @@ func TestAddFlags(t *testing.T) {
 			CIDRAllocatorType:            "CloudAllocator",
 			ConfigureCloudRoutes:         false,
 		},
-		AttachDetachController: &cmoptions.AttachDetachControllerOptions{
+		AttachDetachController: &AttachDetachControllerOptions{
 			ReconcilerSyncLoopPeriod:          metav1.Duration{Duration: 30 * time.Second},
 			DisableAttachDetachReconcilerSync: true,
 		},
-		CSRSigningController: &cmoptions.CSRSigningControllerOptions{
+		CSRSigningController: &CSRSigningControllerOptions{
 			ClusterSigningCertFile: "/cluster-signing-cert",
 			ClusterSigningKeyFile:  "/cluster-signing-key",
 			ClusterSigningDuration: metav1.Duration{Duration: 10 * time.Hour},
 		},
-		DaemonSetController: &cmoptions.DaemonSetControllerOptions{
+		DaemonSetController: &DaemonSetControllerOptions{
 			ConcurrentDaemonSetSyncs: 2,
 		},
-		DeploymentController: &cmoptions.DeploymentControllerOptions{
+		DeploymentController: &DeploymentControllerOptions{
 			ConcurrentDeploymentSyncs:      10,
 			DeploymentControllerSyncPeriod: metav1.Duration{Duration: 45 * time.Second},
 		},
-		DeprecatedFlags: &cmoptions.DeprecatedControllerOptions{
+		DeprecatedFlags: &DeprecatedControllerOptions{
 			DeletingPodsQPS:    0.1,
 			RegisterRetryCount: 10,
 		},
-		EndPointController: &cmoptions.EndPointControllerOptions{
+		EndPointController: &EndPointControllerOptions{
 			ConcurrentEndpointSyncs: 10,
 		},
-		GarbageCollectorController: &cmoptions.GarbageCollectorControllerOptions{
+		GarbageCollectorController: &GarbageCollectorControllerOptions{
 			ConcurrentGCSyncs: 30,
 			GCIgnoredResources: []componentconfig.GroupResource{
 				{Group: "extensions", Resource: "replicationcontrollers"},
@@ -190,24 +190,24 @@ func TestAddFlags(t *testing.T) {
 			},
 			EnableGarbageCollector: false,
 		},
-		HPAController: &cmoptions.HPAControllerOptions{
+		HPAController: &HPAControllerOptions{
 			HorizontalPodAutoscalerSyncPeriod:               metav1.Duration{Duration: 45 * time.Second},
 			HorizontalPodAutoscalerUpscaleForbiddenWindow:   metav1.Duration{Duration: 1 * time.Minute},
 			HorizontalPodAutoscalerDownscaleForbiddenWindow: metav1.Duration{Duration: 2 * time.Minute},
 			HorizontalPodAutoscalerTolerance:                0.1,
 			HorizontalPodAutoscalerUseRESTClients:           true,
 		},
-		JobController: &cmoptions.JobControllerOptions{
+		JobController: &JobControllerOptions{
 			ConcurrentJobSyncs: 5,
 		},
-		NamespaceController: &cmoptions.NamespaceControllerOptions{
+		NamespaceController: &NamespaceControllerOptions{
 			NamespaceSyncPeriod:      metav1.Duration{Duration: 10 * time.Minute},
 			ConcurrentNamespaceSyncs: 20,
 		},
-		NodeIpamController: &cmoptions.NodeIpamControllerOptions{
+		NodeIpamController: &NodeIpamControllerOptions{
 			NodeCIDRMaskSize: 48,
 		},
-		NodeLifecycleController: &cmoptions.NodeLifecycleControllerOptions{
+		NodeLifecycleController: &NodeLifecycleControllerOptions{
 			EnableTaintManager:        false,
 			NodeEvictionRate:          0.2,
 			SecondaryNodeEvictionRate: 0.05,
@@ -217,7 +217,7 @@ func TestAddFlags(t *testing.T) {
 			LargeClusterSizeThreshold: 100,
 			UnhealthyZoneThreshold:    0.6,
 		},
-		PersistentVolumeBinderController: &cmoptions.PersistentVolumeBinderControllerOptions{
+		PersistentVolumeBinderController: &PersistentVolumeBinderControllerOptions{
 			PVClaimBinderSyncPeriod: metav1.Duration{Duration: 30 * time.Second},
 			VolumeConfiguration: componentconfig.VolumeConfiguration{
 				EnableDynamicProvisioning:  false,
@@ -232,20 +232,20 @@ func TestAddFlags(t *testing.T) {
 				},
 			},
 		},
-		PodGCController: &cmoptions.PodGCControllerOptions{
+		PodGCController: &PodGCControllerOptions{
 			TerminatedPodGCThreshold: 12000,
 		},
-		ReplicaSetController: &cmoptions.ReplicaSetControllerOptions{
+		ReplicaSetController: &ReplicaSetControllerOptions{
 			ConcurrentRSSyncs: 10,
 		},
-		ReplicationController: &cmoptions.ReplicationControllerOptions{
+		ReplicationController: &ReplicationControllerOptions{
 			ConcurrentRCSyncs: 10,
 		},
-		ResourceQuotaController: &cmoptions.ResourceQuotaControllerOptions{
+		ResourceQuotaController: &ResourceQuotaControllerOptions{
 			ResourceQuotaSyncPeriod:      metav1.Duration{Duration: 10 * time.Minute},
 			ConcurrentResourceQuotaSyncs: 10,
 		},
-		SAController: &cmoptions.SAControllerOptions{
+		SAController: &SAControllerOptions{
 			ServiceAccountKeyFile:  "/service-account-private-key",
 			ConcurrentSATokenSyncs: 10,
 		},

--- a/cmd/controller-manager/app/options/persistentvolumebindercontroller.go
+++ b/cmd/controller-manager/app/options/persistentvolumebindercontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )

--- a/cmd/controller-manager/app/options/podgccontroller.go
+++ b/cmd/controller-manager/app/options/podgccontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )


--- a/cmd/controller-manager/app/options/replicasetcontroller.go
+++ b/cmd/controller-manager/app/options/replicasetcontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )


--- a/cmd/controller-manager/app/options/replicationcontroller.go
+++ b/cmd/controller-manager/app/options/replicationcontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )


--- a/cmd/controller-manager/app/options/resourcequotacontroller.go
+++ b/cmd/controller-manager/app/options/resourcequotacontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )

--- a/cmd/controller-manager/app/options/serviceaccountcontroller.go
+++ b/cmd/controller-manager/app/options/serviceaccountcontroller.go
@@ -18,6 +18,7 @@ package options

 import (
 	"github.com/spf13/pflag"
+
 	"k8s.io/kubernetes/pkg/apis/componentconfig"
 )