Merge pull request #50768 from shyamjvs/fix-scheduler-metric-in-gke

Automatic merge from submit-queue (batch tested with PRs 50550, 50768) Don't SSH to master for metrics in case of GKE cc @kubernetes/sig-scalability-misc @crassirostris

Merge pull request #50768 from shyamjvs/fix-scheduler-metric-in-gke
b67b0ad7 · Kubernetes Submit Queue · GitHub · a4acc38c · a938c000 · b67b0ad7
Commit b67b0ad7 authored Aug 17, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

metrics_util.go test/e2e/framework/metrics_util.go +4 -0

No files found.
--- a/test/e2e/framework/metrics_util.go
+++ b/test/e2e/framework/metrics_util.go
@@ -469,6 +469,10 @@ func getSchedulingLatency(c clientset.Interface) (*SchedulingLatency, error) {
 		data = string(rawData)
 	} else {
 		// If master is not registered fall back to old method of using SSH.
+		if TestContext.Provider == "gke" {
+			Logf("Not grabbing scheduler metrics through master SSH: unsupported for gke")
+			return nil, nil
+		}
 		cmd := "curl http://localhost:10251/metrics"
 		sshResult, err := SSH(cmd, GetMasterHost()+":22", TestContext.Provider)
 		if err != nil || sshResult.Code != 0 {