Skip to content

K
k3s
Unverified Commit b5f2147a authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

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

Avoid master ssh in eks
parents c6d0cdf3 bb23e0ae
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
test/e2e/framework/metrics_util.go
View file @ b5f2147a
...@@ -293,8 +293,8 @@ func NewEtcdMetricsCollector() *EtcdMetricsCollector { ...@@ -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 ...@@ -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
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment