From 3affc4492cbe5a6ebe83b90ce10f2866b75063f0 Mon Sep 17 00:00:00 2001 From: James DeFelice Date: Mon, 8 Feb 2016 22:15:50 +0000 Subject: [PATCH] add replicaset controller to k8sm controller manager --- contrib/mesos/pkg/controllermanager/controllermanager.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contrib/mesos/pkg/controllermanager/controllermanager.go b/contrib/mesos/pkg/controllermanager/controllermanager.go index eb573016c3d..ea975830322 100644 --- a/contrib/mesos/pkg/controllermanager/controllermanager.go +++ b/contrib/mesos/pkg/controllermanager/controllermanager.go @@ -46,6 +46,7 @@ import ( persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/persistentvolume" "k8s.io/kubernetes/pkg/controller/podautoscaler" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" + replicaset "k8s.io/kubernetes/pkg/controller/replicaset" replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" resourcequotacontroller "k8s.io/kubernetes/pkg/controller/resourcequota" routecontroller "k8s.io/kubernetes/pkg/controller/route" @@ -234,6 +235,12 @@ func (s *CMServer) Run(_ []string) error { go deployment.NewDeploymentController(clientset.NewForConfigOrDie(client.AddUserAgent(kubeconfig, "deployment-controller")), s.resyncPeriod). Run(s.ConcurrentDeploymentSyncs, wait.NeverStop) } + + if containsResource(resources, "replicasets") { + glog.Infof("Starting ReplicaSet controller") + go replicaset.NewReplicaSetController(clientset.NewForConfigOrDie(client.AddUserAgent(kubeconfig, "replicaset-controller")), s.resyncPeriod, replicaset.BurstReplicas). + Run(s.ConcurrentRSSyncs, wait.NeverStop) + } } volumePlugins := kubecontrollermanager.ProbeRecyclableVolumePlugins(s.VolumeConfigFlags)