diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go index d791dd228c9..24514973fff 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go @@ -17,6 +17,7 @@ limitations under the License. package apiserver import ( + "context" "fmt" "net/http" "time" @@ -258,14 +259,14 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) // we don't want to report healthy until we can handle all CRDs that have already been registered. Waiting for the informer // to sync makes sure that the lister will be valid before we begin. There may still be races for CRDs added after startup, // but we won't go healthy until we can handle the ones already present. - s.GenericAPIServer.AddPostStartHookOrDie("crd-informer-synced", func(context genericapiserver.PostStartHookContext) error { - return wait.PollImmediateUntil(100*time.Millisecond, func() (bool, error) { + s.GenericAPIServer.AddPostStartHookOrDie("crd-informer-synced", func(ctx genericapiserver.PostStartHookContext) error { + return wait.PollUntilContextCancel(ctx.Context, 100*time.Millisecond, true, func(ctx context.Context) (bool, error) { if s.Informers.Apiextensions().V1().CustomResourceDefinitions().Informer().HasSynced() { close(hasCRDInformerSyncedSignal) return true, nil } return false, nil - }, context.Done()) + }) }) return s, nil diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go index 0c3b2f59fc8..865d9389b3c 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go @@ -17,6 +17,8 @@ limitations under the License. package apiserver import ( + "context" + "errors" "fmt" "sort" "time" @@ -297,7 +299,7 @@ func (c *DiscoveryController) Run(stopCh <-chan struct{}, synchedCh chan<- struc } // initially sync all group versions to make sure we serve complete discovery - if err := wait.PollImmediateUntil(time.Second, func() (bool, error) { + if err := wait.PollUntilContextCancel(context.Background(), time.Second, true, func(ctx context.Context) (bool, error) { crds, err := c.crdLister.List(labels.Everything()) if err != nil { utilruntime.HandleError(fmt.Errorf("failed to initially list CRDs: %v", err)) @@ -313,10 +315,11 @@ func (c *DiscoveryController) Run(stopCh <-chan struct{}, synchedCh chan<- struc } } return true, nil - }, stopCh); err == wait.ErrWaitTimeout { - utilruntime.HandleError(fmt.Errorf("timed out waiting for discovery endpoint to initialize")) - return - } else if err != nil { + }); err != nil { + if errors.Is(err, context.DeadlineExceeded) { + utilruntime.HandleError(fmt.Errorf("timed out waiting for initial discovery sync")) + return + } panic(fmt.Errorf("unexpected error: %v", err)) } close(synchedCh) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/crd_finalizer.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/crd_finalizer.go index b5d55953f3f..c569642d953 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/crd_finalizer.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/crd_finalizer.go @@ -235,7 +235,7 @@ func (c *CRDFinalizer) deleteInstances(crd *apiextensionsv1.CustomResourceDefini // now we need to wait until all the resources are deleted. Start with a simple poll before we do anything fancy. // TODO not all servers are synchronized on caches. It is possible for a stale one to still be creating things. // Once we have a mechanism for servers to indicate their states, we should check that for concurrence. - err = wait.PollImmediate(5*time.Second, 1*time.Minute, func() (bool, error) { + err = wait.PollUntilContextTimeout(ctx, 5*time.Second, 1*time.Minute, true, func(ctx context.Context) (bool, error) { listObj, err := crClient.List(ctx, nil) if err != nil { return false, err diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/apiapproval_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/apiapproval_test.go index a1f8132a618..19e1cf7cdbd 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/apiapproval_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/apiapproval_test.go @@ -72,10 +72,10 @@ func TestAPIApproval(t *testing.T) { if err != nil { t.Fatal(err) } - err = wait.PollImmediate(100*time.Millisecond, 30*time.Second, func() (bool, error) { - approvedKubeAPI, err = apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), approvedKubeAPI.Name, metav1.GetOptions{}) - if err != nil { - return false, err + err = wait.PollUntilContextTimeout(context.Background(), 100*time.Millisecond, 30*time.Second, true, func(ctx context.Context) (bool, error) { + approvedKubeAPI, getErr := apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, approvedKubeAPI.Name, metav1.GetOptions{}) + if getErr != nil { + return false, getErr } if approvedKubeAPIApproved := findCRDCondition(approvedKubeAPI, apiextensionsv1.KubernetesAPIApprovalPolicyConformant); approvedKubeAPIApproved == nil || approvedKubeAPIApproved.Status != apiextensionsv1.ConditionTrue { t.Log(approvedKubeAPIApproved) diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/conversion_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/conversion_test.go index a420fef9992..9ea69931b82 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/conversion_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/conversion_test.go @@ -219,13 +219,13 @@ func testWebhookConverter(t *testing.T, watchCache bool) { defer ctc.removeConversionWebhook(t) // wait until new webhook is called the first time - if err := wait.PollImmediate(time.Millisecond*100, wait.ForeverTestTimeout, func() (bool, error) { - _, err := ctc.versionedClient(marker.GetNamespace(), "v1alpha1").Get(context.TODO(), marker.GetName(), metav1.GetOptions{}) + if err := wait.PollUntilContextTimeout(context.Background(), time.Millisecond*100, wait.ForeverTestTimeout, true, func(ctx context.Context) (done bool, err error) { + _, getErr := ctc.versionedClient(marker.GetNamespace(), "v1alpha1").Get(ctx, marker.GetName(), metav1.GetOptions{}) select { case <-upCh: return true, nil default: - t.Logf("Waiting for webhook to become effective, getting marker object: %v", err) + t.Logf("Waiting for webhook to become effective, getting marker object: %v", getErr) return false, nil } }); err != nil { diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/webhook.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/webhook.go index 71ecdc80cfb..08cfdb9c2dc 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/webhook.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/conversion/webhook.go @@ -17,6 +17,7 @@ limitations under the License. package conversion import ( + "context" "crypto/tls" "crypto/x509" "encoding/json" @@ -63,9 +64,9 @@ func StartConversionWebhookServer(handler http.Handler) (func(), *apiextensionsv } // StartTLS returns immediately, there is a small chance of a race to avoid. - if err := wait.PollImmediate(time.Millisecond*100, wait.ForeverTestTimeout, func() (bool, error) { - _, err := webhookServer.Client().Get(webhookServer.URL) // even a 404 is fine - return err == nil, nil + if err := wait.PollUntilContextTimeout(context.Background(), time.Millisecond*100, wait.ForeverTestTimeout, true, func(ctx context.Context) (done bool, err error) { + _, getErr := webhookServer.Client().Get(webhookServer.URL) // even a 404 is fine + return getErr == nil, nil }); err != nil { webhookServer.Close() return nil, nil, err diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/defaulting_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/defaulting_test.go index 7162811148e..dfb39571366 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/defaulting_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/defaulting_test.go @@ -316,8 +316,8 @@ func testDefaulting(t *testing.T, watchCache bool) { addDefault("v1beta2", "c", "C") t.Logf("wait until GET sees 'c' in both status and spec") - if err := wait.PollImmediate(100*time.Millisecond, wait.ForeverTestTimeout, func() (bool, error) { - obj, err := fooClient.Get(context.TODO(), foo.GetName(), metav1.GetOptions{}) + if err := wait.PollUntilContextTimeout(context.Background(), 100*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) { + obj, err := fooClient.Get(ctx, foo.GetName(), metav1.GetOptions{}) if err != nil { return false, err } @@ -333,7 +333,7 @@ func testDefaulting(t *testing.T, watchCache bool) { mustExist(foo.Object, [][]string{{"spec", "a"}, {"spec", "b"}, {"spec", "c"}, {"status", "a"}, {"status", "b"}, {"status", "c"}}) t.Logf("wait until GET sees 'c' in both status and spec of cached get") - if err := wait.PollImmediate(100*time.Millisecond, wait.ForeverTestTimeout, func() (bool, error) { + if err := wait.PollUntilContextTimeout(context.Background(), 100*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) { obj, err := fooClient.Get(context.TODO(), foo.GetName(), metav1.GetOptions{ResourceVersion: "0"}) if err != nil { return false, err @@ -409,8 +409,8 @@ func testDefaulting(t *testing.T, watchCache bool) { t.Logf("Add 'c' default to the REST version, remove it from the storage version, and wait until GET no longer sees it in both status and spec") addDefault("v1beta1", "c", "C") removeDefault("v1beta2", "c") - if err := wait.PollImmediate(100*time.Millisecond, wait.ForeverTestTimeout, func() (bool, error) { - obj, err := fooClient.Get(context.TODO(), foo.GetName(), metav1.GetOptions{}) + if err := wait.PollUntilContextTimeout(context.Background(), 100*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) { + obj, err := fooClient.Get(ctx, foo.GetName(), metav1.GetOptions{}) if err != nil { return false, err } @@ -434,8 +434,8 @@ func testDefaulting(t *testing.T, watchCache bool) { removeDefault("v1beta1", "a") removeDefault("v1beta1", "b") removeDefault("v1beta1", "c") - if err := wait.PollImmediate(100*time.Millisecond, wait.ForeverTestTimeout, func() (bool, error) { - obj, err := fooClient.Get(context.TODO(), foo.GetName(), metav1.GetOptions{}) + if err := wait.PollUntilContextTimeout(context.Background(), 100*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) { + obj, err := fooClient.Get(ctx, foo.GetName(), metav1.GetOptions{}) if err != nil { return false, err } diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/resources.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/resources.go index 3647e56ae35..6e729cc6aab 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/resources.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/fixtures/resources.go @@ -347,7 +347,7 @@ func existsInDiscoveryV1(crd *apiextensionsv1.CustomResourceDefinition, apiExten func waitForCRDReadyWatchUnsafe(crd *apiextensionsv1.CustomResourceDefinition, apiExtensionsClient clientset.Interface) (*apiextensionsv1.CustomResourceDefinition, error) { // wait until all resources appears in discovery for _, version := range servedV1Versions(crd) { - err := wait.PollImmediate(500*time.Millisecond, 30*time.Second, func() (bool, error) { + err := wait.PollUntilContextTimeout(context.Background(), 500*time.Millisecond, 30*time.Second, true, func(ctx context.Context) (bool, error) { return existsInDiscoveryV1(crd, apiExtensionsClient, version) }) if err != nil { @@ -375,7 +375,7 @@ func waitForCRDReady(crd *apiextensionsv1.CustomResourceDefinition, apiExtension // For this test, we'll actually cycle, "list/watch/create/delete" until we get an RV from list that observes the create and not an error. // This way all the tests that are checking for watches don't have to worry about RV too old problems because crazy things *could* happen // before like the created RV could be too old to watch. - err = wait.PollImmediate(500*time.Millisecond, 30*time.Second, func() (bool, error) { + err = wait.PollUntilContextTimeout(context.Background(), 500*time.Millisecond, 30*time.Second, true, func(ctx context.Context) (bool, error) { return isWatchCachePrimed(v1CRD, dynamicClientSet) }) if err != nil { @@ -396,7 +396,7 @@ func CreateNewV1CustomResourceDefinitionWatchUnsafe(v1CRD *apiextensionsv1.Custo // wait until all resources appears in discovery for _, version := range servedV1Versions(v1CRD) { - err := wait.PollImmediate(500*time.Millisecond, 30*time.Second, func() (bool, error) { + err := wait.PollUntilContextTimeout(context.Background(), 500*time.Millisecond, 30*time.Second, true, func(ctx context.Context) (bool, error) { return existsInDiscoveryV1(v1CRD, apiExtensionsClient, version) }) if err != nil { @@ -424,7 +424,7 @@ func CreateNewV1CustomResourceDefinition(v1CRD *apiextensionsv1.CustomResourceDe // For this test, we'll actually cycle, "list/watch/create/delete" until we get an RV from list that observes the create and not an error. // This way all the tests that are checking for watches don't have to worry about RV too old problems because crazy things *could* happen // before like the created RV could be too old to watch. - err = wait.PollImmediate(500*time.Millisecond, 30*time.Second, func() (bool, error) { + err = wait.PollUntilContextTimeout(context.Background(), 500*time.Millisecond, 30*time.Second, true, func(ctx context.Context) (bool, error) { return isWatchCachePrimed(v1CRD, dynamicClientSet) }) if err != nil { @@ -518,7 +518,7 @@ func DeleteV1CustomResourceDefinition(crd *apiextensionsv1.CustomResourceDefinit return err } for _, version := range servedV1Versions(crd) { - err := wait.PollImmediate(500*time.Millisecond, 30*time.Second, func() (bool, error) { + err := wait.PollUntilContextTimeout(context.Background(), 500*time.Millisecond, 30*time.Second, true, func(ctx context.Context) (bool, error) { exists, err := existsInDiscoveryV1(crd, apiExtensionsClient, version) return !exists, err }) @@ -540,7 +540,7 @@ func DeleteV1CustomResourceDefinitions(deleteListOpts metav1.ListOptions, apiExt } for _, crd := range list.Items { for _, version := range servedV1Versions(&crd) { - err := wait.PollImmediate(500*time.Millisecond, 30*time.Second, func() (bool, error) { + err := wait.PollUntilContextTimeout(context.Background(), 500*time.Millisecond, 30*time.Second, true, func(ctx context.Context) (bool, error) { exists, err := existsInDiscoveryV1(&crd, apiExtensionsClient, version) return !exists, err }) diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/listtype_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/listtype_test.go index ea9d0cf867a..2e4e6e64694 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/listtype_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/listtype_test.go @@ -209,16 +209,16 @@ func TestListTypes(t *testing.T) { } t.Logf("Updating again with invalid values, eventually successfully due to ratcheting logic") - err = wait.PollImmediate(time.Millisecond*100, wait.ForeverTestTimeout, func() (bool, error) { - _, err = fooClient.Update(context.TODO(), modifiedInstance, metav1.UpdateOptions{}) - if err == nil { - return true, err + err = wait.PollUntilContextTimeout(context.Background(), time.Millisecond*100, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) { + _, updateErr := fooClient.Update(ctx, modifiedInstance, metav1.UpdateOptions{}) + if updateErr == nil { + return true, nil } - if errors.IsInvalid(err) { + if errors.IsInvalid(updateErr) { // wait until modifiedInstance becomes valid again return false, nil } - return false, err + return false, updateErr }) if err != nil { t.Fatalf("unexpected error: %v", err) diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/validation_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/validation_test.go index e9925960f37..94378306513 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/validation_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/validation_test.go @@ -18,6 +18,7 @@ package integration import ( "context" + "errors" "fmt" "strings" "testing" @@ -777,15 +778,16 @@ func TestCRValidationOnCRDUpdate(t *testing.T) { } // CR is now accepted - err = wait.Poll(500*time.Millisecond, wait.ForeverTestTimeout, func() (bool, error) { - _, err := noxuResourceClient.Create(context.TODO(), instanceToCreate, metav1.CreateOptions{}) - if _, isStatus := err.(*apierrors.StatusError); isStatus { - if apierrors.IsInvalid(err) { + err = wait.PollUntilContextTimeout(context.Background(), 500*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (done bool, err error) { + _, createErr := noxuResourceClient.Create(ctx, instanceToCreate, metav1.CreateOptions{}) + var statusErr *apierrors.StatusError + if errors.As(createErr, &statusErr) { + if apierrors.IsInvalid(createErr) { return false, nil } } - if err != nil { - return false, err + if createErr != nil { + return false, createErr } return true, nil }) @@ -925,8 +927,8 @@ spec: // wait for condition with violations t.Log("Waiting for NonStructuralSchema condition") var cond *apiextensionsv1.CustomResourceDefinitionCondition - err = wait.PollImmediate(100*time.Millisecond, 5*time.Second, func() (bool, error) { - obj, err := apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), name, metav1.GetOptions{}) + err = wait.PollUntilContextTimeout(context.Background(), 100*time.Millisecond, 5*time.Second, true, func(ctx context.Context) (done bool, err error) { + obj, err := apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, name, metav1.GetOptions{}) if err != nil { return false, err } @@ -963,8 +965,8 @@ spec: // wait for condition to go away t.Log("Wait for condition to disappear") - err = wait.PollImmediate(100*time.Millisecond, 5*time.Second, func() (bool, error) { - obj, err := apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), name, metav1.GetOptions{}) + err = wait.PollUntilContextTimeout(context.Background(), 100*time.Millisecond, 5*time.Second, true, func(ctx context.Context) (done bool, err error) { + obj, err := apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, name, metav1.GetOptions{}) if err != nil { return false, err } @@ -1529,8 +1531,8 @@ properties: if len(tst.expectedViolations) == 0 { // wait for condition to not appear var cond *apiextensionsv1.CustomResourceDefinitionCondition - err := wait.PollImmediate(100*time.Millisecond, 5*time.Second, func() (bool, error) { - obj, err := apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), betaCRD.Name, metav1.GetOptions{}) + err = wait.PollUntilContextTimeout(context.Background(), 100*time.Millisecond, 5*time.Second, true, func(ctx context.Context) (done bool, err error) { + obj, err := apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, betaCRD.Name, metav1.GetOptions{}) if err != nil { return false, err } @@ -1540,7 +1542,7 @@ properties: } return true, nil }) - if err != wait.ErrWaitTimeout { + if !errors.Is(err, context.DeadlineExceeded) { t.Fatalf("expected no NonStructuralSchema condition, but got one: %v", cond) } return @@ -1548,8 +1550,8 @@ properties: // wait for condition to appear with the given violations var cond *apiextensionsv1.CustomResourceDefinitionCondition - err = wait.PollImmediate(100*time.Millisecond, wait.ForeverTestTimeout, func() (bool, error) { - obj, err := apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.TODO(), betaCRD.Name, metav1.GetOptions{}) + err = wait.PollUntilContextTimeout(context.Background(), 100*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (done bool, err error) { + obj, err := apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, betaCRD.Name, metav1.GetOptions{}) if err != nil { return false, err } diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/versioning_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/versioning_test.go index 66ff77f7b67..0b2c82c672a 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/versioning_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/versioning_test.go @@ -18,6 +18,7 @@ package integration import ( "context" + stderrors "errors" "fmt" "net/http" "reflect" @@ -25,6 +26,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apiextensions-apiserver/test/integration/fixtures" "k8s.io/apimachinery/pkg/api/errors" @@ -88,18 +90,19 @@ func TestInternalVersionIsHandlerVersion(t *testing.T) { { t.Logf("patch of handler version v1beta1 (non-storage version) should succeed") i := 0 - err = wait.PollImmediate(time.Millisecond*100, wait.ForeverTestTimeout, func() (bool, error) { + err = wait.PollUntilContextTimeout(context.Background(), time.Millisecond*100, wait.ForeverTestTimeout, true, func(ctx context.Context) (done bool, err error) { patch := []byte(fmt.Sprintf(`{"i": %d}`, i)) i++ - _, err := noxuNamespacedResourceClientV1beta1.Patch(context.TODO(), "foo", types.MergePatchType, patch, metav1.PatchOptions{}) - if err != nil { + _, patchErr := noxuNamespacedResourceClientV1beta1.Patch(ctx, "foo", types.MergePatchType, patch, metav1.PatchOptions{}) + if patchErr != nil { // work around "grpc: the client connection is closing" error // TODO: fix the grpc error - if err, ok := err.(*errors.StatusError); ok && err.Status().Code == http.StatusInternalServerError { + var statusErr *errors.StatusError + if stderrors.As(patchErr, &statusErr) && statusErr.Status().Code == http.StatusInternalServerError { return false, nil } - return false, err + return false, patchErr } return true, nil }) @@ -111,20 +114,21 @@ func TestInternalVersionIsHandlerVersion(t *testing.T) { t.Logf("patch of handler version v1beta2 (storage version) should fail") i := 0 noxuNamespacedResourceClientV1beta2 := newNamespacedCustomResourceVersionedClient(ns, dynamicClient, noxuDefinition, "v1beta2") // use the storage version v1beta2 - err = wait.PollImmediate(time.Millisecond*100, wait.ForeverTestTimeout, func() (bool, error) { + err = wait.PollUntilContextTimeout(context.Background(), time.Millisecond*100, wait.ForeverTestTimeout, true, func(ctx context.Context) (done bool, err error) { patch := []byte(fmt.Sprintf(`{"i": %d}`, i)) i++ - _, err := noxuNamespacedResourceClientV1beta2.Patch(context.TODO(), "foo", types.MergePatchType, patch, metav1.PatchOptions{}) - assert.Error(t, err) + _, patchErr := noxuNamespacedResourceClientV1beta2.Patch(ctx, "foo", types.MergePatchType, patch, metav1.PatchOptions{}) + require.Error(t, patchErr) // work around "grpc: the client connection is closing" error // TODO: fix the grpc error - if err, ok := err.(*errors.StatusError); ok && err.Status().Code == http.StatusInternalServerError { + var statusErr *errors.StatusError + if stderrors.As(patchErr, &statusErr) && statusErr.Status().Code == http.StatusInternalServerError { return false, nil } - assert.ErrorContains(t, err, "apiVersion") + assert.ErrorContains(t, patchErr, "apiVersion") return true, nil }) assert.NoError(t, err)