Skip to content

K
k3s
Commit ffdf2892 authored by Piotr Szczesniak's avatar Piotr Szczesniak
Browse files
Options

Merge pull request #17838 from wojtek-t/fix_scheduler_latency_in_kubemark

Reenable scheduler metrics in scalability tests.
parents 3cc588b5 81a105cb
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
test/e2e/density.go
View file @ ffdf2892
...@@ -112,8 +112,7 @@ var _ = Describe("Density [Skipped]", func() { ...@@ -112,8 +112,7 @@ var _ = Describe("Density [Skipped]", func() {
// Verify scheduler metrics. // Verify scheduler metrics.
// TODO: Reset metrics at the beginning of the test. // TODO: Reset metrics at the beginning of the test.
// We should do something similar to how we do it for APIserver. // We should do something similar to how we do it for APIserver.
// TODO: Reenable it once it is running with Kubemark. expectNoError(VerifySchedulerLatency())
// expectNoError(VerifySchedulerLatency())
}) })
framework := NewFramework("density") framework := NewFramework("density")
......
test/e2e/util.go
View file @ ffdf2892
...@@ -2131,7 +2131,7 @@ func getSigner(provider string) (ssh.Signer, error) { ...@@ -2131,7 +2131,7 @@ func getSigner(provider string) (ssh.Signer, error) {
// support. // support.
keyfile := "" keyfile := ""
switch provider { switch provider {
case "gce", "gke": case "gce", "gke", "kubemark":
keyfile = "google_compute_engine" keyfile = "google_compute_engine"
case "aws": case "aws":
// If there is an env. variable override, use that. // If there is an env. variable override, use that.
......
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