@@ -37,6 +37,9 @@ const (

 	InfraDaemonSetControllerServiceAccountName = "daemonset-controller"

 	DaemonSetControllerRoleName                = "system:daemonset-controller"

+	InfraDisruptionControllerServiceAccountName = "disruption-controller"

+	DisruptionControllerRoleName                = "system:disruption-controller"

+

 	InfraHPAControllerServiceAccountName = "hpa-controller"

 	HPAControllerRoleName                = "system:hpa-controller"

@@ -330,13 +333,13 @@ func init() {

 				{

 					APIGroups: []string{extensions.GroupName, batch.GroupName},

 					Verbs:     sets.NewString("list", "watch"),

-					Resources: sets.NewString("jobs"),

+					Resources: sets.NewString("jobs", "scheduledjobs"),

 				},

 				// JobController.syncJob() -> updateJobStatus()

 				{

 					APIGroups: []string{extensions.GroupName, batch.GroupName},

 					Verbs:     sets.NewString("update"),

-					Resources: sets.NewString("jobs/status"),

+					Resources: sets.NewString("jobs/status", "scheduledjobs/status"),

 				},

 				// JobController.podController.ListWatch

 				{

@@ -679,6 +682,50 @@ func init() {

 	}

 	err = InfraSAs.addServiceAccount(

+		InfraDisruptionControllerServiceAccountName,

+		authorizationapi.ClusterRole{

+			ObjectMeta: kapi.ObjectMeta{

+				Name: DisruptionControllerRoleName,

+			},

+			Rules: []authorizationapi.PolicyRule{

+				// DisruptionBudgetController.dStore.ListWatch

+				{

+					APIGroups: []string{extensions.GroupName},

+					Verbs:     sets.NewString("list", "watch"),

+					Resources: sets.NewString("deployments"),

+				},

+				// DisruptionBudgetController.rsStore.ListWatch

+				{

+					APIGroups: []string{extensions.GroupName},

+					Verbs:     sets.NewString("list", "watch"),

+					Resources: sets.NewString("replicasets"),

+				},

+				// DisruptionBudgetController.rcStore.ListWatch

+				{

+					APIGroups: []string{kapi.GroupName},

+					Verbs:     sets.NewString("list", "watch"),

+					Resources: sets.NewString("replicationcontrollers"),

+				},

+				// DisruptionBudgetController.dStore.ListWatch

+				{

+					APIGroups: []string{policy.GroupName},

+					Verbs:     sets.NewString("get", "list", "watch"),

+					Resources: sets.NewString("poddisruptionbudgets"),

+				},

+				// DisruptionBudgetController.dbControl

+				{

+					APIGroups: []string{policy.GroupName},

+					Verbs:     sets.NewString("update"),

+					Resources: sets.NewString("poddisruptionbudgets/status"),

+				},

+			},

+		},

+	)

+	if err != nil {

+		panic(err)

+	}

+

+	err = InfraSAs.addServiceAccount(

 		InfraNamespaceControllerServiceAccountName,

 		authorizationapi.ClusterRole{

 			ObjectMeta: kapi.ObjectMeta{

@@ -17,12 +17,18 @@ import (

 	"k8s.io/kubernetes/pkg/api/v1"

 	appsv1alpha1 "k8s.io/kubernetes/pkg/apis/apps/v1alpha1"

 	autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"

+	"k8s.io/kubernetes/pkg/apis/batch"

 	batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1"

+	batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"

+	certificatesv1alpha1 "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1"

 	"k8s.io/kubernetes/pkg/apis/componentconfig"

 	extv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"

+	policyv1alpha1 "k8s.io/kubernetes/pkg/apis/policy/v1alpha1"

 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

 	"k8s.io/kubernetes/pkg/client/record"

+	"k8s.io/kubernetes/pkg/client/restclient"

 	"k8s.io/kubernetes/pkg/client/typed/dynamic"

+	kclient "k8s.io/kubernetes/pkg/client/unversioned"

 	clientadapter "k8s.io/kubernetes/pkg/client/unversioned/adapters/internalclientset"

 	"k8s.io/kubernetes/pkg/controller/deployment"

 	"k8s.io/kubernetes/pkg/master"

@@ -34,6 +40,7 @@ import (

 	client "k8s.io/kubernetes/pkg/client/unversioned"

 	"k8s.io/kubernetes/pkg/controller/daemon"

+	"k8s.io/kubernetes/pkg/controller/disruption"

 	endpointcontroller "k8s.io/kubernetes/pkg/controller/endpoint"

 	jobcontroller "k8s.io/kubernetes/pkg/controller/job"

 	namespacecontroller "k8s.io/kubernetes/pkg/controller/namespace"

@@ -44,6 +51,7 @@ import (

 	gccontroller "k8s.io/kubernetes/pkg/controller/podgc"

 	replicasetcontroller "k8s.io/kubernetes/pkg/controller/replicaset"

 	replicationcontroller "k8s.io/kubernetes/pkg/controller/replication"

+	"k8s.io/kubernetes/pkg/controller/scheduledjob"

 	servicecontroller "k8s.io/kubernetes/pkg/controller/service"

 	attachdetachcontroller "k8s.io/kubernetes/pkg/controller/volume/attachdetach"

 	persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/volume/persistentvolume"

@@ -124,11 +132,15 @@ func (c *MasterConfig) InstallAPI(container *restful.Container) ([]string, error

 		messages = append(messages, fmt.Sprintf("Started Kubernetes API at %%s%s", KubeAPIPrefix))

 	}

+	// TODO: this is a bit much - I exist in some code somewhere

 	versions := []unversioned.GroupVersion{

 		extv1beta1.SchemeGroupVersion,

 		batchv1.SchemeGroupVersion,

+		batchv2alpha1.SchemeGroupVersion,

 		autoscalingv1.SchemeGroupVersion,

+		certificatesv1alpha1.SchemeGroupVersion,

 		appsv1alpha1.SchemeGroupVersion,

+		policyv1alpha1.SchemeGroupVersion,

 		federationv1beta1.SchemeGroupVersion,

 	}

 	for _, ver := range versions {

@@ -290,6 +302,22 @@ func (c *MasterConfig) RunJobController(client *client.Client) {

 	go controller.Run(int(c.ControllerManager.ConcurrentJobSyncs), utilwait.NeverStop)

 }

+// RunScheduledJobController starts the Kubernetes scheduled job controller sync loop

+func (c *MasterConfig) RunScheduledJobController(config *restclient.Config) {

+	// TODO: this is a temp fix for allowing kubeClient list v2alpha1 jobs, should switch to using clientset

+	config.ContentConfig.GroupVersion = &unversioned.GroupVersion{Group: batch.GroupName, Version: "v2alpha1"}

+	client, err := kclient.New(config)

+	if err != nil {

+		glog.Fatalf("Unable to configure scheduled job controller: %v", err)

+	}

+	go scheduledjob.NewScheduledJobController(client).Run(utilwait.NeverStop)

+}

+

+// RunDisruptionBudgetController starts the Kubernetes disruption budget controller

+func (c *MasterConfig) RunDisruptionBudgetController(client *client.Client) {

+	go disruption.NewDisruptionController(c.Informers.Pods().Informer(), client).Run(utilwait.NeverStop)

+}

+

 // RunHPAController starts the Kubernetes hpa controller sync loop

 func (c *MasterConfig) RunHPAController(oc *osclient.Client, kc *client.Client, heapsterNamespace string) {

 	clientsetClient := clientadapter.FromUnversionedClient(kc)

@@ -17,7 +17,11 @@ import (

 	cmapp "k8s.io/kubernetes/cmd/kube-controller-manager/app/options"

 	kerrors "k8s.io/kubernetes/pkg/api/errors"

+	"k8s.io/kubernetes/pkg/apis/apps"

+	"k8s.io/kubernetes/pkg/apis/autoscaling"

+	"k8s.io/kubernetes/pkg/apis/batch"

 	"k8s.io/kubernetes/pkg/apis/extensions"

+	"k8s.io/kubernetes/pkg/apis/policy"

 	"k8s.io/kubernetes/pkg/capabilities"

 	"k8s.io/kubernetes/pkg/client/typed/dynamic"

 	clientadapter "k8s.io/kubernetes/pkg/client/unversioned/adapters/internalclientset"

@@ -569,7 +573,7 @@ func startControllers(oc *origin.MasterConfig, kc *kubernetes.MasterConfig) erro

 		if err != nil {

 			glog.Fatalf("Could not get client for deployment controller: %v", err)

 		}

-		_, _, jobClient, err := oc.GetServiceAccountClients(bootstrappolicy.InfraJobControllerServiceAccountName)

+		jobConfig, _, jobClient, err := oc.GetServiceAccountClients(bootstrappolicy.InfraJobControllerServiceAccountName)

 		if err != nil {

 			glog.Fatalf("Could not get client for job controller: %v", err)

 		}

@@ -593,6 +597,11 @@ func startControllers(oc *origin.MasterConfig, kc *kubernetes.MasterConfig) erro

 			glog.Fatalf("Could not get client for daemonset controller: %v", err)

 		}

+		_, _, disruptionClient, err := oc.GetServiceAccountClients(bootstrappolicy.InfraDisruptionControllerServiceAccountName)

+		if err != nil {

+			glog.Fatalf("Could not get client for disruption budget controller: %v", err)

+		}

+

 		_, _, gcClient, err := oc.GetServiceAccountClients(bootstrappolicy.InfraGCControllerServiceAccountName)

 		if err != nil {

 			glog.Fatalf("Could not get client for pod gc controller: %v", err)

@@ -629,20 +638,27 @@ func startControllers(oc *origin.MasterConfig, kc *kubernetes.MasterConfig) erro

 		extensionsEnabled := len(configapi.GetEnabledAPIVersionsForGroup(kc.Options, extensions.GroupName)) > 0

-		// TODO: enable this check once the job controller can use the batch API if the extensions API is disabled

-		// batchEnabled := len(configapi.GetEnabledAPIVersionsForGroup(kc.Options, batch.GroupName)) > 0

-		if extensionsEnabled /*|| batchEnabled*/ {

+		batchEnabled := len(configapi.GetEnabledAPIVersionsForGroup(kc.Options, batch.GroupName)) > 0

+		if extensionsEnabled || batchEnabled {

 			kc.RunJobController(jobClient)

 		}

+		if batchEnabled {

+			kc.RunScheduledJobController(jobConfig)

+		}

 		// TODO: enable this check once the HPA controller can use the autoscaling API if the extensions API is disabled

-		// autoscalingEnabled := len(configapi.GetEnabledAPIVersionsForGroup(kc.Options, autoscaling.GroupName)) > 0

-		if extensionsEnabled /*|| autoscalingEnabled*/ {

+		autoscalingEnabled := len(configapi.GetEnabledAPIVersionsForGroup(kc.Options, autoscaling.GroupName)) > 0

+		if extensionsEnabled || autoscalingEnabled {

 			kc.RunHPAController(hpaOClient, hpaKClient, oc.Options.PolicyConfig.OpenShiftInfrastructureNamespace)

 		}

 		if extensionsEnabled {

 			kc.RunDaemonSetsController(daemonSetClient)

 		}

+		policyEnabled := len(configapi.GetEnabledAPIVersionsForGroup(kc.Options, policy.GroupName)) > 0

+		if policyEnabled {

+			kc.RunDisruptionBudgetController(disruptionClient)

+		}

+

 		kc.RunEndpointController(endpointControllerClient)

 		kc.RunNamespaceController(namespaceControllerClientSet, namespaceControllerClientPool)

 		kc.RunPersistentVolumeController(binderClient, oc.Options.PolicyConfig.OpenShiftInfrastructureNamespace, oc.ImageFor("recycler"), bootstrappolicy.InfraPersistentVolumeRecyclerControllerServiceAccountName)

@@ -650,7 +666,11 @@ func startControllers(oc *origin.MasterConfig, kc *kubernetes.MasterConfig) erro

 		kc.RunGCController(gcClient)

 		kc.RunServiceLoadBalancerController(serviceLoadBalancerClient)

-		kc.RunPetSetController(petSetClient)

+

+		appsEnabled := len(configapi.GetEnabledAPIVersionsForGroup(kc.Options, apps.GroupName)) > 0

+		if appsEnabled {

+			kc.RunPetSetController(petSetClient)

+		}

 		glog.Infof("Started Kubernetes Controllers")

 	}