REVIEW: adapt: wrap controller manager AddFlags with our controller list

pkg/cmd/server/api/validation/master.go

@@ -15,12 +15,12 @@ import (
 	kuval "k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	apiserveroptions "k8s.io/kubernetes/cmd/kube-apiserver/app/options"
-	controlleroptions "k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
 	kvalidation "k8s.io/kubernetes/pkg/api/validation"
 	"k8s.io/kubernetes/pkg/serviceaccount"
 
 	"github.com/openshift/origin/pkg/cmd/server/api"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
+	"github.com/openshift/origin/pkg/cmd/server/cm"
 	"github.com/openshift/origin/pkg/security/mcs"
 	"github.com/openshift/origin/pkg/security/uid"
 	"github.com/openshift/origin/pkg/util/labelselector"
@@ -677,7 +677,7 @@ func ValidateAPIServerExtendedArguments(config api.ExtendedArguments, fldPath *f
 }
 
 func ValidateControllerExtendedArguments(config api.ExtendedArguments, fldPath *field.Path) field.ErrorList {
-	return ValidateExtendedArguments(config, controlleroptions.NewCMServer().AddFlags, fldPath)
+	return ValidateExtendedArguments(config, cm.OriginControllerManagerAddFlags, fldPath)
 }
 
 func ValidateAdmissionPluginConfig(pluginConfig map[string]api.AdmissionPluginConfig, fieldPath *field.Path) field.ErrorList {

pkg/cmd/server/cm/defaults.go

@@ -0,0 +1,17 @@
+package cm
+
+import (
+	"github.com/spf13/pflag"
+
+	kcmapp "k8s.io/kubernetes/cmd/kube-controller-manager/app"
+	kcmoptions "k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
+)
+
+var (
+	// default to the same controllers as upstream
+	ControllersDisabledByDefault = kcmapp.ControllersDisabledByDefault
+)
+
+func OriginControllerManagerAddFlags(flags *pflag.FlagSet) {
+	kcmoptions.NewCMServer().AddFlags(flags, kcmapp.KnownControllers(), ControllersDisabledByDefault.List())
+}

pkg/cmd/server/kubernetes/master_config.go

@@ -58,6 +58,7 @@ import (
 	"github.com/openshift/origin/pkg/api"
 	"github.com/openshift/origin/pkg/cmd/flagtypes"
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
+	"github.com/openshift/origin/pkg/cmd/server/cm"
 	"github.com/openshift/origin/pkg/cmd/server/crypto"
 	"github.com/openshift/origin/pkg/cmd/server/election"
 	cmdflags "github.com/openshift/origin/pkg/cmd/util/flags"
@@ -242,7 +243,7 @@ func BuildKubernetesMasterConfig(
 	// resolve extended arguments
 	// TODO: this should be done in config validation (along with the above) so we can provide
 	// proper errors
-	if err := cmdflags.Resolve(options.KubernetesMasterConfig.ControllerArguments, cmserver.AddFlags); len(err) > 0 {
+	if err := cmdflags.Resolve(options.KubernetesMasterConfig.ControllerArguments, cm.OriginControllerManagerAddFlags); len(err) > 0 {
 		return nil, kerrors.NewAggregate(err)
 	}
 

pkg/cmd/server/start/kubernetes/controllers.go

@@ -7,9 +7,10 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/openshift/origin/pkg/cmd/server/cm"
+	kflag "k8s.io/apiserver/pkg/util/flag"
 	controllerapp "k8s.io/kubernetes/cmd/kube-controller-manager/app"
 	controlleroptions "k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
-	kflag "k8s.io/kubernetes/pkg/util/flag"
 	"k8s.io/kubernetes/pkg/util/logs"
 )
 
@@ -42,7 +43,7 @@ func NewControllersCommand(name, fullName string, out io.Writer) *cobra.Command
 
 	flags := cmd.Flags()
 	flags.SetNormalizeFunc(kflag.WordSepNormalizeFunc)
-	controllerOptions.AddFlags(flags)
+	cm.OriginControllerManagerAddFlags(flags)
 
 	return cmd
 }