Merge branch 'master' into fix_es_mapping

kubernetes-retired · Sep 2, 2016 · ab7a19f · ab7a19f
2 parents 6ecdc58 + 2a7fbcf
commit ab7a19f
Show file tree

Hide file tree

Showing 16 changed files with 351 additions and 239 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Makefile b/Makefile
@@ -1,17 +1,16 @@
 all: build
 
-TAG = v1.2.0-beta.0
+TAG = v1.2.0-beta.2
 PREFIX = gcr.io/google_containers
 FLAGS = 
 
 SUPPORTED_KUBE_VERSIONS = "1.2.4"
 TEST_NAMESPACE = heapster-e2e-tests
 
 deps:
-	go get github.com/tools/godep
+	which godep || go get github.com/tools/godep
 
 build: clean deps
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build ./...
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -o heapster k8s.io/heapster/metrics
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -o eventer k8s.io/heapster/events
 

diff --git a/README.md b/README.md
@@ -12,8 +12,6 @@ It can be extended to support other cluster management solutions easily.
 Heapster collects and interprets various signals like compute resource usage, lifecycle events, etc, and exports cluster metrics via [REST endpoints](docs/model.md).
 **Note: Some of the endpoints are only valid in Kubernetes clusters**
 
-Use [Kubedash](https://github.com/kubernetes/kubedash) to visualize data exported by Heapster.
-
 Heapster supports multiple sources of data.
 More information [here](docs/source-configuration.md).
 

diff --git a/RELEASES.md b/RELEASES.md
diff --git a/deploy/docker-compose/README.md b/deploy/docker-compose/README.md
diff --git a/deploy/docker-compose/docker-compose.yml b/deploy/docker-compose/docker-compose.yml
diff --git a/deploy/docker-compose/sample-hosts.json b/deploy/docker-compose/sample-hosts.json
diff --git a/docs/hacking.md b/docs/hacking.md
diff --git a/integration/framework.go b/integration/framework.go
@@ -64,7 +64,10 @@ type kubeFramework interface {
 	GetProxyUrlForService(service *api.Service) string
 
 	// Returns the node hostnames.
-	GetNodes() ([]string, error)
+	GetNodeNames() ([]string, error)
+
+	// Returns the nodes.
+	GetNodes() (*api.NodeList, error)
 
 	// Returns pod names in the cluster.
 	// TODO: Remove, or mix with namespace
@@ -410,22 +413,25 @@ func (self *realKubeFramework) GetProxyUrlForService(service *api.Service) strin
 	return fmt.Sprintf("%s/api/v1/proxy/namespaces/default/services/%s/", self.masterIP, service.Name)
 }
 
-func (self *realKubeFramework) GetNodes() ([]string, error) {
+func (self *realKubeFramework) GetNodeNames() ([]string, error) {
 	var nodes []string
-	nodeList, err := self.kubeClient.Nodes().List(api.ListOptions{
-		LabelSelector: labels.Everything(),
-		FieldSelector: fields.Everything(),
-	})
+	nodeList, err := self.GetNodes()
 	if err != nil {
 		return nodes, err
 	}
-
 	for _, node := range nodeList.Items {
 		nodes = append(nodes, node.Name)
 	}
 	return nodes, nil
 }
 
+func (self *realKubeFramework) GetNodes() (*api.NodeList, error) {
+	return self.kubeClient.Nodes().List(api.ListOptions{
+		LabelSelector: labels.Everything(),
+		FieldSelector: fields.Everything(),
+	})
+}
+
 func (self *realKubeFramework) GetAllRunningPods() ([]api.Pod, error) {
 	return getRunningPods(true, self.kubeClient)
 }