diff --git a/cmd/kube-controller-manager/app/apps.go b/cmd/kube-controller-manager/app/apps.go index 57898b5fce..4994b0541f 100644 --- a/cmd/kube-controller-manager/app/apps.go +++ b/cmd/kube-controller-manager/app/apps.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubernetes/pkg/controller/daemon" + "k8s.io/kubernetes/pkg/controller/replicaset" "k8s.io/kubernetes/pkg/controller/statefulset" ) @@ -59,3 +60,16 @@ func startStatefulSetController(ctx ControllerContext) (bool, error) { ).Run(1, ctx.Stop) return true, nil } + +func startReplicaSetController(ctx ControllerContext) (bool, error) { + if !ctx.AvailableResources[schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "replicasets"}] { + return false, nil + } + go replicaset.NewReplicaSetController( + ctx.InformerFactory.Apps().V1().ReplicaSets(), + ctx.InformerFactory.Core().V1().Pods(), + ctx.ClientBuilder.ClientOrDie("replicaset-controller"), + replicaset.BurstReplicas, + ).Run(int(ctx.ComponentConfig.ConcurrentRSSyncs), ctx.Stop) + return true, nil +} diff --git a/cmd/kube-controller-manager/app/extensions.go b/cmd/kube-controller-manager/app/extensions.go index 2c30fde86b..fe2133f58e 100644 --- a/cmd/kube-controller-manager/app/extensions.go +++ b/cmd/kube-controller-manager/app/extensions.go @@ -25,7 +25,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kubernetes/pkg/controller/deployment" - "k8s.io/kubernetes/pkg/controller/replicaset" ) func startDeploymentController(ctx ControllerContext) (bool, error) { @@ -44,16 +43,3 @@ func startDeploymentController(ctx ControllerContext) (bool, error) { go dc.Run(int(ctx.ComponentConfig.ConcurrentDeploymentSyncs), ctx.Stop) return true, nil } - -func startReplicaSetController(ctx ControllerContext) (bool, error) { - if !ctx.AvailableResources[schema.GroupVersionResource{Group: "extensions", Version: "v1beta1", Resource: "replicasets"}] { - return false, nil - } - go replicaset.NewReplicaSetController( - ctx.InformerFactory.Extensions().V1beta1().ReplicaSets(), - ctx.InformerFactory.Core().V1().Pods(), - ctx.ClientBuilder.ClientOrDie("replicaset-controller"), - replicaset.BurstReplicas, - ).Run(int(ctx.ComponentConfig.ConcurrentRSSyncs), ctx.Stop) - return true, nil -}