mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #73193 from shyamjvs/avoid-master-ssh
Avoid master ssh in eks
This commit is contained in:
commit
b5f2147a5a
@ -293,8 +293,8 @@ func NewEtcdMetricsCollector() *EtcdMetricsCollector {
|
||||
|
||||
func getEtcdMetrics() ([]*model.Sample, error) {
|
||||
// Etcd is only exposed on localhost level. We are using ssh method
|
||||
if TestContext.Provider == "gke" {
|
||||
Logf("Not grabbing scheduler metrics through master SSH: unsupported for gke")
|
||||
if TestContext.Provider == "gke" || TestContext.Provider == "eks" {
|
||||
Logf("Not grabbing etcd metrics through master SSH: unsupported for %s", TestContext.Provider)
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
@ -620,8 +620,8 @@ func sendRestRequestToScheduler(c clientset.Interface, op string) (string, error
|
||||
responseText = string(body)
|
||||
} 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")
|
||||
if TestContext.Provider == "gke" || TestContext.Provider == "eks" {
|
||||
Logf("Not grabbing scheduler metrics through master SSH: unsupported for %s", TestContext.Provider)
|
||||
return "", nil
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user