github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-24 19:12:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #117735 from nilekhc/fix-TestKMSv2Healthz-flake

Browse Source 
[KMSv2] fix: fixes flake in TestKMSv2Healthz
This commit is contained in:
Kubernetes Prow Robot 2023-05-04 15:45:33 -07:00 committed by GitHub
commit 8a58c00c2a
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/integration/controlplane/transformation/transformation_test.go
View File

@ -528,7 +528,7 @@ func (e *transformTest) printMetrics() error {
func mustBeHealthy(t kubeapiservertesting.Logger, checkName, wantBodyContains string, clientConfig *rest.Config, excludes ...string) { func mustBeHealthy(t kubeapiservertesting.Logger, checkName, wantBodyContains string, clientConfig *rest.Config, excludes ...string) {
t.Helper() t.Helper()
var restErr error var restErr error
pollErr := wait.PollImmediate(2*time.Second, 2*time.Minute, func() (bool, error) { pollErr := wait.PollImmediate(1*time.Second, 5*time.Minute, func() (bool, error) {
body, ok, err := getHealthz(checkName, clientConfig, excludes...) body, ok, err := getHealthz(checkName, clientConfig, excludes...)
restErr = err restErr = err
if err != nil { if err != nil {
@ -541,7 +541,7 @@ func mustBeHealthy(t kubeapiservertesting.Logger, checkName, wantBodyContains st
return done, nil return done, nil
}) })
if pollErr == wait.ErrWaitTimeout { if pollErr != nil {
t.Fatalf("failed to get the expected healthz status of OK for check: %s, error: %v, debug inner error: %v", checkName, pollErr, restErr) t.Fatalf("failed to get the expected healthz status of OK for check: %s, error: %v, debug inner error: %v", checkName, pollErr, restErr)
} }
} }
@ -549,7 +549,7 @@ func mustBeHealthy(t kubeapiservertesting.Logger, checkName, wantBodyContains st
func mustBeUnHealthy(t kubeapiservertesting.Logger, checkName, wantBodyContains string, clientConfig *rest.Config, excludes ...string) { func mustBeUnHealthy(t kubeapiservertesting.Logger, checkName, wantBodyContains string, clientConfig *rest.Config, excludes ...string) {
t.Helper() t.Helper()
var restErr error var restErr error
pollErr := wait.PollImmediate(2*time.Second, 2*time.Minute, func() (bool, error) { pollErr := wait.PollImmediate(1*time.Second, 5*time.Minute, func() (bool, error) {
body, ok, err := getHealthz(checkName, clientConfig, excludes...) body, ok, err := getHealthz(checkName, clientConfig, excludes...)
restErr = err restErr = err
if err != nil { if err != nil {
@ -562,7 +562,7 @@ func mustBeUnHealthy(t kubeapiservertesting.Logger, checkName, wantBodyContains
return done, nil return done, nil
}) })
if pollErr == wait.ErrWaitTimeout { if pollErr != nil {
t.Fatalf("failed to get the expected healthz status of !OK for check: %s, error: %v, debug inner error: %v", checkName, pollErr, restErr) t.Fatalf("failed to get the expected healthz status of !OK for check: %s, error: %v, debug inner error: %v", checkName, pollErr, restErr)
} }
} }