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

Now use the stock watchtools.Until

Browse Source 
By passing in the same initial resource version each time, we get
all watch events from the beginning each time.
This commit is contained in:
Aaron Crickenberger 2020-06-18 22:26:06 -07:00
parent 1048dddc36
commit 4582e26ae1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/common/configmap.go
View File

@ -192,7 +192,6 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() {
} }
cml, err := f.ClientSet.CoreV1().ConfigMaps(testNamespaceName).List(context.TODO(), metav1.ListOptions{LabelSelector: "test-configmap-static=true"}) cml, err := f.ClientSet.CoreV1().ConfigMaps(testNamespaceName).List(context.TODO(), metav1.ListOptions{LabelSelector: "test-configmap-static=true"})
framework.ExpectNoError(err) framework.ExpectNoError(err)
retryWatcher, err := watchtools.NewRetryWatcher(cml.ResourceVersion, w)
ginkgo.By("creating a ConfigMap") ginkgo.By("creating a ConfigMap")
_, err = f.ClientSet.CoreV1().ConfigMaps(testNamespaceName).Create(context.TODO(), &testConfigMap, metav1.CreateOptions{}) _, err = f.ClientSet.CoreV1().ConfigMaps(testNamespaceName).Create(context.TODO(), &testConfigMap, metav1.CreateOptions{})
@ -200,7 +199,7 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() {
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel() defer cancel()
_, err = framework.WatchUntilWithoutRetry(ctx, retryWatcher, func(event watch.Event) (bool, error) { _, err = watchtools.Until(ctx, cml.ResourceVersion, w, func(event watch.Event) (bool, error) {
switch event.Type { switch event.Type {
case watch.Added: case watch.Added:
if cm, ok := event.Object.(*v1.ConfigMap); ok { if cm, ok := event.Object.(*v1.ConfigMap); ok {
@ -234,7 +233,7 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() {
ginkgo.By("waiting for the ConfigMap to be modified") ginkgo.By("waiting for the ConfigMap to be modified")
ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second) ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second)
defer cancel() defer cancel()
_, err = framework.WatchUntilWithoutRetry(ctx, retryWatcher, func(event watch.Event) (bool, error) { _, err = watchtools.Until(ctx, cml.ResourceVersion, w, func(event watch.Event) (bool, error) {
switch event.Type { switch event.Type {
case watch.Modified: case watch.Modified:
if cm, ok := event.Object.(*v1.ConfigMap); ok { if cm, ok := event.Object.(*v1.ConfigMap); ok {
@ -283,7 +282,7 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() {
ginkgo.By("waiting for the ConfigMap to be deleted") ginkgo.By("waiting for the ConfigMap to be deleted")
ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second) ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second)
defer cancel() defer cancel()
_, err = framework.WatchUntilWithoutRetry(ctx, retryWatcher, func(event watch.Event) (bool, error) { _, err = watchtools.Until(ctx, cml.ResourceVersion, w, func(event watch.Event) (bool, error) {
switch event.Type { switch event.Type {
case watch.Deleted: case watch.Deleted:
if cm, ok := event.Object.(*v1.ConfigMap); ok { if cm, ok := event.Object.(*v1.ConfigMap); ok {