github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #45151 from liggitt/async-token 

Automatic merge from submit-queue

Wait for controller events in resource conflict test

Fixes #45137 

same fix as #44996, missed that there was a second test involving resource conflicts
pull/6/head
Kubernetes Submit Queue 2017-04-29 21:22:35 -07:00 committed by GitHub
parent 55e552d24d 24efb3736b
commit 19d1d76b36
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controller/serviceaccount/tokens_controller_test.go
View File

@ -325,10 +325,13 @@ func TestTokenCreation(t *testing.T) {
},
"new serviceaccount with no secrets with resource conflict": {
ClientObjects: []runtime.Object{updatedServiceAccount(emptySecretReferences()), createdTokenSecret()},
IsAsync: true,
MaxRetries: 1,
AddedServiceAccount: serviceAccount(emptySecretReferences()),
ExpectedActions: []core.Action{
core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "serviceaccounts"}, metav1.NamespaceDefault, "default"),
core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "serviceaccounts"}, metav1.NamespaceDefault, "default"),
},
},
"updated serviceaccount with no secrets": {