github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118342 from yt2985/cleanSA

Browse Source 
Fix the flaky legacy_service_account_token_clean_up_test.
This commit is contained in:
Kubernetes Prow Robot
2023-06-12 22:33:57 -07:00
committed by GitHub
parent b4a7427ac3 9cb52a6872
commit 83d30f4463
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/integration/serviceaccount/legacy_service_account_token_clean_up_test.go
View File

@@ -183,21 +183,16 @@ func TestLegacyServiceAccountTokenCleanUp(t *testing.T) {
}
}
_, err = c.CoreV1().Secrets(myns).Get(context.TODO(), test.secretName, metav1.GetOptions{})
if err != nil {
if apierrors.IsNotFound(err) {
t.Fatalf("The secret %s should not be cleaned up, err: %v", test.secretName, err)
} else {
t.Fatalf("Failed to get secret %s, err: %v", test.secretName, err)
}
}
fakeClock.Step(cleanUpPeriod + 24*time.Hour)
time.Sleep(2 * syncInterval)
liveSecret, err = c.CoreV1().Secrets(myns).Get(context.TODO(), test.secretName, metav1.GetOptions{})
if test.expectCleanedUp && err == nil {
t.Fatalf("The secret %s should be cleaned up. time: %v; creationTime: %v", test.secretName, fakeClock.Now().UTC(), liveSecret.CreationTimestamp)
} else if !test.expectCleanedUp && err != nil {
if test.expectCleanedUp {
if err == nil {
t.Fatalf("The secret %s should be cleaned up. time: %v; creationTime: %v", test.secretName, fakeClock.Now().UTC(), liveSecret.CreationTimestamp)
} else if !apierrors.IsNotFound(err) {
t.Fatalf("Failed to get secret %s, err: %v", test.secretName, err)
}
} else if err != nil {
if apierrors.IsNotFound(err) {
t.Fatalf("The secret %s should not be cleaned up, err: %v", test.secretName, err)
} else {