github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47961 from piosz/heapster-1.4

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 47961, 46276)

Bumped Heapster to v1.4.0-beta.0

Heapster release candidate for Kubernetes 1.7

cc @dchen1107 @caesarxuchao
This commit is contained in:
Kubernetes Submit Queue
2017-06-26 02:11:52 -07:00
committed by GitHub
parent 53a66020e4 8d5d85e126
commit e725c8fca7
6 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/monitoring.go
View File

@@ -48,8 +48,8 @@ var _ = framework.KubeDescribe("Monitoring", func() {
const (
influxdbService = "monitoring-influxdb"
influxdbDatabaseName = "k8s"
podlistQuery = "show tag values from \"cpu/usage\" with key = pod_id"
nodelistQuery = "show tag values from \"cpu/usage\" with key = hostname"
podlistQuery = "show tag values from \"cpu/usage\" with key = pod_name"
nodelistQuery = "show tag values from \"cpu/usage\" with key = nodename"
sleepBetweenAttempts = 5 * time.Second
testTimeout = 5 * time.Minute
initializationTimeout = 5 * time.Minute
@@ -161,7 +161,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string,
if pod.DeletionTimestamp != nil {
continue
}
expectedPods = append(expectedPods, string(pod.UID))
expectedPods = append(expectedPods, pod.Name)
}
}
// Do the same for all deployments.
@@ -176,7 +176,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string,
if pod.DeletionTimestamp != nil {
continue
}
expectedPods = append(expectedPods, string(pod.UID))
expectedPods = append(expectedPods, pod.Name)
}
}
// And for pet sets.
@@ -191,7 +191,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string,
if pod.DeletionTimestamp != nil {
continue
}
expectedPods = append(expectedPods, string(pod.UID))
expectedPods = append(expectedPods, pod.Name)
}
}
}