github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #73193 from shyamjvs/avoid-master-ssh

Browse Source 
Avoid master ssh in eks
This commit is contained in:
Kubernetes Prow Robot 2019-01-26 02:51:49 -08:00 committed by GitHub
commit b5f2147a5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/metrics_util.go
View File

@ -293,8 +293,8 @@ func NewEtcdMetricsCollector() *EtcdMetricsCollector {
func getEtcdMetrics() ([]*model.Sample, error) { func getEtcdMetrics() ([]*model.Sample, error) {
// Etcd is only exposed on localhost level. We are using ssh method // Etcd is only exposed on localhost level. We are using ssh method
if TestContext.Provider == "gke" { if TestContext.Provider == "gke" || TestContext.Provider == "eks" {
Logf("Not grabbing scheduler metrics through master SSH: unsupported for gke") Logf("Not grabbing etcd metrics through master SSH: unsupported for %s", TestContext.Provider)
return nil, nil return nil, nil
} }
@ -620,8 +620,8 @@ func sendRestRequestToScheduler(c clientset.Interface, op string) (string, error
responseText = string(body) responseText = string(body)
} else { } else {
// If master is not registered fall back to old method of using SSH. // If master is not registered fall back to old method of using SSH.
if TestContext.Provider == "gke" { if TestContext.Provider == "gke" || TestContext.Provider == "eks" {
Logf("Not grabbing scheduler metrics through master SSH: unsupported for gke") Logf("Not grabbing scheduler metrics through master SSH: unsupported for %s", TestContext.Provider)
return "", nil return "", nil
} }