Merge pull request #10247 from ncdc/kube-1.3-picks

Merged by openshift-bot
openshift · Aug 8, 2016 · aaea4d9 · aaea4d9
2 parents 7998ae4 + f73592b
commit aaea4d9
Show file tree

Hide file tree

Showing 32 changed files with 1,840 additions and 802 deletions.
diff --git a/pkg/cmd/server/kubernetes/master.go b/pkg/cmd/server/kubernetes/master.go
@@ -337,7 +337,7 @@ func (c *MasterConfig) RunNodeController() {
 	_, clusterCIDR, _ := net.ParseCIDR(s.ClusterCIDR)
 	_, serviceCIDR, _ := net.ParseCIDR(s.ServiceCIDR)
 
-	controller := nodecontroller.NewNodeController(
+	controller, err := nodecontroller.NewNodeController(
 		c.CloudProvider,
 		clientadapter.FromUnversionedClient(c.KubeClient),
 		s.PodEvictionTimeout.Duration,
@@ -356,6 +356,9 @@ func (c *MasterConfig) RunNodeController() {
 
 		s.AllocateNodeCIDRs,
 	)
+	if err != nil {
+		glog.Fatalf("Unable to start node controller: %v", err)
+	}
 
 	controller.Run(s.NodeSyncPeriod.Duration)
 }

diff --git a/vendor/github.com/google/cadvisor/container/docker/handler.go b/vendor/github.com/google/cadvisor/container/docker/handler.go
diff --git a/vendor/github.com/google/cadvisor/devicemapper/thin_pool_watcher.go b/vendor/github.com/google/cadvisor/devicemapper/thin_pool_watcher.go
diff --git a/vendor/k8s.io/kubernetes/cmd/integration/integration.go b/vendor/k8s.io/kubernetes/cmd/integration/integration.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go