@@ -19,6 +19,7 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/resourcequota"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/service"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/volumeclaimbinder"

 	"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler"

 	_ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithmprovider"

 	schedulerapi "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api"

@@ -95,6 +96,12 @@ func (c *MasterConfig) RunNamespaceController() {

 	glog.Infof("Started Kubernetes Namespace Manager")

 }

+func (c *MasterConfig) RunPersistentVolumeClaimBinder() {

+	binder := volumeclaimbinder.NewPersistentVolumeClaimBinder(c.KubeClient, 5*time.Minute)

+	binder.Run()

+	glog.Infof("Started Kubernetes Persistent Volume Claim Binder")

+}

+

 // RunReplicationController starts the Kubernetes replication controller sync loop

 func (c *MasterConfig) RunReplicationController() {

 	controllerManager := controller.NewReplicationManager(c.KubeClient, controller.BurstReplicas)

@@ -358,6 +358,7 @@ func StartMaster(openshiftMasterConfig *configapi.MasterConfig) error {

 		kubeConfig.RunMinionController()

 		kubeConfig.RunResourceQuotaManager()

 		kubeConfig.RunNamespaceController()

+		kubeConfig.RunPersistentVolumeClaimBinder()

 	} else {

 		_, kubeConfig, err := configapi.GetKubeClient(openshiftMasterConfig.MasterClients.ExternalKubernetesKubeConfig)