Adjust to new wait utils

sbueringer · sbueringer · commit 7b3f2136e0a1 · 2023-05-23T15:38:54.000+02:00
diff --git a/cmd/clusterctl/client/client_test.go b/cmd/clusterctl/client/client_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package client
 
 import (
+	"context"
 	"fmt"
 	"testing"
 	"time"
@@ -209,7 +210,7 @@ func newFakeCluster(kubeconfig cluster.Kubeconfig, configClient config.Client) *
 	}
 
 	fake.fakeProxy = test.NewFakeProxy()
-	pollImmediateWaiter := func(interval, timeout time.Duration, condition wait.ConditionFunc) error {
+	pollImmediateWaiter := func(ctx context.Context, interval, timeout time.Duration, condition wait.ConditionWithContextFunc) error {
 		return nil
 	}
 
diff --git a/cmd/clusterctl/client/cluster/cert_manager.go b/cmd/clusterctl/client/cluster/cert_manager.go
@@ -526,7 +526,7 @@ func (cm *certManagerClient) deleteObj(obj unstructured.Unstructured) error {
 // cert-manager API group.
 // If retry is true, the createObj call will be retried if it fails. Otherwise, the
 // 'create' operations will only be attempted once.
-func (cm *certManagerClient) waitForAPIReady(_ context.Context, retry bool) error {
+func (cm *certManagerClient) waitForAPIReady(ctx context.Context, retry bool) error {
 	log := logf.Log
 	// Waits for the cert-manager to be available.
 	if retry {
@@ -544,7 +544,7 @@ func (cm *certManagerClient) waitForAPIReady(_ context.Context, retry bool) erro
 		// Create the Kubernetes object.
 		// This is wrapped with a retry as the cert-manager API may not be available
 		// yet, so we need to keep retrying until it is.
-		if err := cm.pollImmediateWaiter(waitCertManagerInterval, cm.getWaitTimeout(), func() (bool, error) {
+		if err := cm.pollImmediateWaiter(ctx, waitCertManagerInterval, cm.getWaitTimeout(), func(ctx context.Context) (bool, error) {
 			if err := cm.createObj(o); err != nil {
 				// If retrying is disabled, return the error here.
 				if !retry {
diff --git a/cmd/clusterctl/client/cluster/cert_manager_test.go b/cmd/clusterctl/client/cluster/cert_manager_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package cluster
 
 import (
+	"context"
 	"fmt"
 	"testing"
 	"time"
@@ -165,7 +166,7 @@ func Test_getManifestObjs(t *testing.T) {
 }
 
 func Test_GetTimeout(t *testing.T) {
-	pollImmediateWaiter := func(interval, timeout time.Duration, condition wait.ConditionFunc) error {
+	pollImmediateWaiter := func(ctx context.Context, interval, timeout time.Duration, condition wait.ConditionWithContextFunc) error {
 		return nil
 	}
 
@@ -421,7 +422,7 @@ func Test_shouldUpgrade(t *testing.T) {
 			g := NewWithT(t)
 			proxy := test.NewFakeProxy()
 			fakeConfigClient := newFakeConfig().WithCertManager("", tt.configVersion, "")
-			pollImmediateWaiter := func(interval, timeout time.Duration, condition wait.ConditionFunc) error {
+			pollImmediateWaiter := func(ctx context.Context, interval, timeout time.Duration, condition wait.ConditionWithContextFunc) error {
 				return nil
 			}
 			cm := newCertManagerClient(fakeConfigClient, nil, proxy, pollImmediateWaiter)
@@ -706,7 +707,7 @@ func Test_certManagerClient_PlanUpgrade(t *testing.T) {
 
 			proxy := test.NewFakeProxy().WithObjs(tt.objs...)
 			fakeConfigClient := newFakeConfig()
-			pollImmediateWaiter := func(interval, timeout time.Duration, condition wait.ConditionFunc) error {
+			pollImmediateWaiter := func(ctx context.Context, interval, timeout time.Duration, condition wait.ConditionWithContextFunc) error {
 				return nil
 			}
 			cm := newCertManagerClient(fakeConfigClient, nil, proxy, pollImmediateWaiter)
diff --git a/cmd/clusterctl/client/cluster/client.go b/cmd/clusterctl/client/cluster/client.go
@@ -89,7 +89,7 @@ type Client interface {
 }
 
 // PollImmediateWaiter tries a condition func until it returns true, an error, or the timeout is reached.
-type PollImmediateWaiter func(interval, timeout time.Duration, condition wait.ConditionFunc) error
+type PollImmediateWaiter func(ctx context.Context, interval, timeout time.Duration, condition wait.ConditionWithContextFunc) error
 
 // clusterClient implements Client.
 type clusterClient struct {
@@ -214,7 +214,9 @@ func newClusterClient(kubeconfig Kubeconfig, configClient config.Client, options
 
 	// if there is an injected PollImmediateWaiter, use it, otherwise use the default one
 	if client.pollImmediateWaiter == nil {
-		client.pollImmediateWaiter = wait.PollImmediate
+		client.pollImmediateWaiter = func(ctx context.Context, interval, timeout time.Duration, condition wait.ConditionWithContextFunc) error {
+			return wait.PollUntilContextTimeout(ctx, interval, timeout, true, condition)
+		}
 	}
 
 	return client
diff --git a/cmd/clusterctl/client/cluster/installer.go b/cmd/clusterctl/client/cluster/installer.go
@@ -141,7 +141,7 @@ func waitManagerDeploymentsReady(opts InstallOptions, installQueue []repository.
 		for _, obj := range components.Objs() {
 			if util.IsDeploymentWithManager(obj) {
 				if err := waitDeploymentReady(obj, opts.WaitProviderTimeout, proxy); err != nil {
-					return err
+					return errors.Wrapf(err, "deployment %q is not ready after %s", obj.GetName(), opts.WaitProviderTimeout)
 				}
 			}
 		}
@@ -150,7 +150,7 @@ func waitManagerDeploymentsReady(opts InstallOptions, installQueue []repository.
 }
 
 func waitDeploymentReady(deployment unstructured.Unstructured, timeout time.Duration, proxy Proxy) error {
-	return wait.Poll(100*time.Millisecond, timeout, func() (bool, error) {
+	return wait.PollUntilContextTimeout(context.TODO(), 100*time.Millisecond, timeout, false, func(ctx context.Context) (bool, error) {
 		c, err := proxy.NewClient()
 		if err != nil {
 			return false, err
@@ -160,7 +160,7 @@ func waitDeploymentReady(deployment unstructured.Unstructured, timeout time.Dura
 			Name:      deployment.GetName(),
 		}
 		dep := &appsv1.Deployment{}
-		if err := c.Get(context.TODO(), key, dep); err != nil {
+		if err := c.Get(ctx, key, dep); err != nil {
 			return false, err
 		}
 		for _, c := range dep.Status.Conditions {
diff --git a/cmd/clusterctl/client/cluster/internal/dryrun/client.go b/cmd/clusterctl/client/cluster/internal/dryrun/client.go
@@ -30,6 +30,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/internal/scheme"
 )
 
@@ -114,7 +115,7 @@ type ChangeSummary struct {
 // when the objects are not found in the internal object tracker. Typically the apiReader passed would be a reader client
 // to a real Kubernetes Cluster.
 func NewClient(apiReader client.Reader, objs []client.Object) *Client {
-	fakeClient := fake.NewClientBuilder().WithObjects(objs...).WithScheme(localScheme).Build()
+	fakeClient := fake.NewClientBuilder().WithObjects(objs...).WithStatusSubresource(&clusterv1.ClusterClass{}, &clusterv1.Cluster{}).WithScheme(localScheme).Build()
 	return &Client{
 		fakeClient: fakeClient,
 		apiReader:  apiReader,
@@ -308,6 +309,16 @@ func (c *Client) SubResource(subResource string) client.SubResourceClient {
 	return c.fakeClient.SubResource(subResource)
 }
 
+// GroupVersionKindFor returns the GroupVersionKind for the given object.
+func (c *Client) GroupVersionKindFor(obj runtime.Object) (schema.GroupVersionKind, error) {
+	return c.fakeClient.GroupVersionKindFor(obj)
+}
+
+// IsObjectNamespaced returns true if the GroupVersionKind of the object is namespaced.
+func (c *Client) IsObjectNamespaced(obj runtime.Object) (bool, error) {
+	return c.fakeClient.IsObjectNamespaced(obj)
+}
+
 // Changes generates a summary of all the changes observed from the creation of the dry run client
 // to when this function is called.
 func (c *Client) Changes(ctx context.Context) (*ChangeSummary, error) {
diff --git a/cmd/clusterctl/client/cluster/inventory.go b/cmd/clusterctl/client/cluster/inventory.go
@@ -17,6 +17,7 @@ limitations under the License.
 package cluster
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -197,7 +198,7 @@ func (p *inventoryClient) EnsureCustomResourceDefinitions() error {
 		// If the object is a CRDs, waits for it being Established.
 		if apiextensionsv1.SchemeGroupVersion.WithKind("CustomResourceDefinition").GroupKind() == o.GroupVersionKind().GroupKind() {
 			crdKey := client.ObjectKeyFromObject(&o)
-			if err := p.pollImmediateWaiter(waitInventoryCRDInterval, waitInventoryCRDTimeout, func() (bool, error) {
+			if err := p.pollImmediateWaiter(ctx, waitInventoryCRDInterval, waitInventoryCRDTimeout, func(ctx context.Context) (bool, error) {
 				c, err := p.proxy.NewClient()
 				if err != nil {
 					return false, err
diff --git a/cmd/clusterctl/client/cluster/inventory_test.go b/cmd/clusterctl/client/cluster/inventory_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package cluster
 
 import (
+	"context"
 	"testing"
 	"time"
 
@@ -31,7 +32,7 @@ import (
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test"
 )
 
-func fakePollImmediateWaiter(_, _ time.Duration, _ wait.ConditionFunc) error {
+func fakePollImmediateWaiter(_ context.Context, _, _ time.Duration, _ wait.ConditionWithContextFunc) error {
 	return nil
 }
 
diff --git a/cmd/clusterctl/client/cluster/topology.go b/cmd/clusterctl/client/cluster/topology.go
@@ -567,11 +567,11 @@ func (t *topologyClient) defaultAndValidateObjs(ctx context.Context, objs []*uns
 			}
 		}
 		if oldObject != nil {
-			if err := validator.ValidateUpdate(ctx, oldObject, object); err != nil {
+			if _, err := validator.ValidateUpdate(ctx, oldObject, object); err != nil {
 				return errors.Wrapf(err, "failed validation of %s %s/%s", obj.GroupVersionKind().String(), obj.GetNamespace(), obj.GetName())
 			}
 		} else {
-			if err := validator.ValidateCreate(ctx, object); err != nil {
+			if _, err := validator.ValidateCreate(ctx, object); err != nil {
 				return errors.Wrapf(err, "failed validation of %s %s/%s", obj.GroupVersionKind().String(), obj.GetNamespace(), obj.GetName())
 			}
 		}
diff --git a/cmd/clusterctl/client/init.go b/cmd/clusterctl/client/init.go
@@ -92,6 +92,12 @@ type InitOptions struct {
 func (c *clusterctlClient) Init(options InitOptions) ([]Components, error) {
 	log := logf.Log
 
+	// Default WaitProviderTimeout as we cannot rely on defaulting in the CLI
+	// when clusterctl is used as a library.
+	if options.WaitProviderTimeout.Nanoseconds() == 0 {
+		options.WaitProviderTimeout = time.Duration(5*60) * time.Second
+	}
+
 	// gets access to the management cluster
 	clusterClient, err := c.clusterClientFactory(ClusterClientFactoryInput{Kubeconfig: options.Kubeconfig})
 	if err != nil {
diff --git a/cmd/clusterctl/client/repository/repository_github.go b/cmd/clusterctl/client/repository/repository_github.go
@@ -290,10 +290,10 @@ func (g *gitHubRepository) getVersions() ([]string, error) {
 	// NB. currently Github API does not support result ordering, so it not possible to limit results
 	var allReleases []*github.RepositoryRelease
 	var retryError error
-	_ = wait.PollImmediate(retryableOperationInterval, retryableOperationTimeout, func() (bool, error) {
+	_ = wait.PollUntilContextTimeout(context.TODO(), retryableOperationInterval, retryableOperationTimeout, true, func(ctx context.Context) (bool, error) {
 		var listReleasesErr error
 		// Get the first page of GitHub releases.
-		releases, response, listReleasesErr := client.Repositories.ListReleases(context.TODO(), g.owner, g.repository, &github.ListOptions{PerPage: githubListReleasesPerPageLimit})
+		releases, response, listReleasesErr := client.Repositories.ListReleases(ctx, g.owner, g.repository, &github.ListOptions{PerPage: githubListReleasesPerPageLimit})
 		if listReleasesErr != nil {
 			retryError = g.handleGithubErr(listReleasesErr, "failed to get the list of releases")
 			// Return immediately if we are rate limited.
@@ -308,7 +308,7 @@ func (g *gitHubRepository) getVersions() ([]string, error) {
 		// pages in the response, which can be used to iterate through the pages.
 		// https://github.com/google/go-github/blob/14bb610698fc2f9013cad5db79b2d5fe4d53e13c/github/github.go#L541-L551
 		for response.NextPage != 0 {
-			releases, response, listReleasesErr = client.Repositories.ListReleases(context.TODO(), g.owner, g.repository, &github.ListOptions{Page: response.NextPage, PerPage: githubListReleasesPerPageLimit})
+			releases, response, listReleasesErr = client.Repositories.ListReleases(ctx, g.owner, g.repository, &github.ListOptions{Page: response.NextPage, PerPage: githubListReleasesPerPageLimit})
 			if listReleasesErr != nil {
 				retryError = g.handleGithubErr(listReleasesErr, "failed to get the list of releases")
 				// Return immediately if we are rate limited.
@@ -353,9 +353,9 @@ func (g *gitHubRepository) getReleaseByTag(tag string) (*github.RepositoryReleas
 
 	var release *github.RepositoryRelease
 	var retryError error
-	_ = wait.PollImmediate(retryableOperationInterval, retryableOperationTimeout, func() (bool, error) {
+	_ = wait.PollUntilContextTimeout(context.TODO(), retryableOperationInterval, retryableOperationTimeout, true, func(ctx context.Context) (bool, error) {
 		var getReleasesErr error
-		release, _, getReleasesErr = client.Repositories.GetReleaseByTag(context.TODO(), g.owner, g.repository, tag)
+		release, _, getReleasesErr = client.Repositories.GetReleaseByTag(ctx, g.owner, g.repository, tag)
 		if getReleasesErr != nil {
 			retryError = g.handleGithubErr(getReleasesErr, "failed to read release %q", tag)
 			// Return immediately if not found
@@ -405,7 +405,8 @@ func (g *gitHubRepository) downloadFilesFromRelease(release *github.RepositoryRe
 
 	var reader io.ReadCloser
 	var retryError error
-	_ = wait.PollImmediate(retryableOperationInterval, retryableOperationTimeout, func() (bool, error) {
+	var content []byte
+	_ = wait.PollUntilContextTimeout(ctx, retryableOperationInterval, retryableOperationTimeout, true, func(ctx context.Context) (bool, error) {
 		var redirect string
 		var downloadReleaseError error
 		reader, redirect, downloadReleaseError = client.Repositories.DownloadReleaseAsset(ctx, g.owner, g.repository, *assetID, http.DefaultClient)
@@ -417,28 +418,29 @@ func (g *gitHubRepository) downloadFilesFromRelease(release *github.RepositoryRe
 			}
 			return false, nil
 		}
+		defer reader.Close()
+
 		if redirect != "" {
 			// NOTE: DownloadReleaseAsset should not return a redirect address when used with the DefaultClient.
 			retryError = errors.New("unexpected redirect while downloading the release asset")
 			return true, retryError
 		}
 
+		// Read contents from the reader (redirect or not), and return.
+		var err error
+		content, err = io.ReadAll(reader)
+		if err != nil {
+			retryError = errors.Wrapf(err, "failed to read downloaded file %q from %q release", *release.TagName, fileName)
+			return false, nil
+		}
+
 		retryError = nil
 		return true, nil
 	})
-	if reader != nil {
-		defer reader.Close()
-	}
 	if retryError != nil {
 		return nil, retryError
 	}
 
-	// Read contents from the reader (redirect or not), and return.
-	content, err := io.ReadAll(reader)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to read downloaded file %q from %q release", *release.TagName, fileName)
-	}
-
 	cacheFiles[cacheID] = content
 	return content, nil
 }
diff --git a/cmd/clusterctl/client/upgrade.go b/cmd/clusterctl/client/upgrade.go
@@ -136,6 +136,12 @@ func (c *clusterctlClient) ApplyUpgrade(options ApplyUpgradeOptions) error {
 		return errors.Errorf("current version of clusterctl could only upgrade to %s contract, requested %s", clusterv1.GroupVersion.Version, options.Contract)
 	}
 
+	// Default WaitProviderTimeout as we cannot rely on defaulting in the CLI
+	// when clusterctl is used as a library.
+	if options.WaitProviderTimeout.Nanoseconds() == 0 {
+		options.WaitProviderTimeout = time.Duration(5*60) * time.Second
+	}
+
 	// Get the client for interacting with the management cluster.
 	clusterClient, err := c.clusterClientFactory(ClusterClientFactoryInput{Kubeconfig: options.Kubeconfig})
 	if err != nil {
diff --git a/exp/runtime/internal/controllers/warmup.go b/exp/runtime/internal/controllers/warmup.go
@@ -72,7 +72,7 @@ func (r *warmupRunnable) Start(ctx context.Context) error {
 	ctx, cancel := context.WithTimeout(ctx, r.warmupTimeout)
 	defer cancel()
 
-	err := wait.PollImmediateWithContext(ctx, r.warmupInterval, r.warmupTimeout, func(ctx context.Context) (done bool, err error) {
+	err := wait.PollUntilContextTimeout(ctx, r.warmupInterval, r.warmupTimeout, true, func(ctx context.Context) (done bool, err error) {
 		if err = warmupRegistry(ctx, r.Client, r.APIReader, r.RuntimeClient); err != nil {
 			log.Error(err, "ExtensionConfig registry warmup failed")
 			return false, nil
diff --git a/internal/goproxy/goproxy.go b/internal/goproxy/goproxy.go
@@ -81,7 +81,7 @@ func (g *Client) GetVersions(ctx context.Context, gomodulePath string) (semver.V
 		var rawResponse []byte
 		var responseStatusCode int
 		var retryError error
-		_ = wait.PollImmediateWithContext(ctx, retryableOperationInterval, retryableOperationTimeout, func(ctx context.Context) (bool, error) {
+		_ = wait.PollUntilContextTimeout(ctx, retryableOperationInterval, retryableOperationTimeout, true, func(ctx context.Context) (bool, error) {
 			retryError = nil
 
 			resp, err := http.DefaultClient.Do(req)
diff --git a/test/framework/cluster_proxy.go b/test/framework/cluster_proxy.go
@@ -194,7 +194,7 @@ func (p *clusterProxy) GetClient() client.Client {
 
 	var c client.Client
 	var newClientErr error
-	err := wait.PollImmediate(retryableOperationInterval, retryableOperationTimeout, func() (bool, error) {
+	err := wait.PollUntilContextTimeout(context.TODO(), retryableOperationInterval, retryableOperationTimeout, true, func(ctx context.Context) (bool, error) {
 		c, newClientErr = client.New(config, client.Options{Scheme: p.scheme})
 		if newClientErr != nil {
 			return false, nil //nolint:nilerr
diff --git a/test/framework/deployment_helpers.go b/test/framework/deployment_helpers.go
@@ -224,7 +224,7 @@ func newWatchPodLogsEventHandler(ctx context.Context, input watchPodLogsInput, s
 	}
 }
 
-func (eh *watchPodLogsEventHandler) OnAdd(obj interface{}) {
+func (eh *watchPodLogsEventHandler) OnAdd(obj interface{}, _ bool) {
 	pod := obj.(*corev1.Pod)
 	eh.streamPodLogs(pod)
 }
@@ -287,7 +287,7 @@ func (eh *watchPodLogsEventHandler) streamPodLogs(pod *corev1.Pod) {
 			}
 
 			// Retry streaming the logs of the pods unless ctx.Done() or if the pod does not exist anymore.
-			err = wait.PollInfiniteWithContext(eh.ctx, 2*time.Second, func(ctx context.Context) (done bool, err error) {
+			err = wait.PollUntilContextCancel(eh.ctx, 2*time.Second, false, func(ctx context.Context) (done bool, err error) {
 				// Wait for pod to be in running state
 				actual, err := eh.input.ClientSet.CoreV1().Pods(pod.Namespace).Get(ctx, pod.Name, metav1.GetOptions{})
 				if err != nil {
diff --git a/test/framework/machinepool_helpers.go b/test/framework/machinepool_helpers.go
@@ -286,7 +286,7 @@ func getMachinePoolInstanceVersions(ctx context.Context, input GetMachinesPoolIn
 	versions := make([]string, len(instances))
 	for i, instance := range instances {
 		node := &corev1.Node{}
-		err := wait.PollImmediate(retryableOperationInterval, retryableOperationTimeout, func() (bool, error) {
+		err := wait.PollUntilContextTimeout(ctx, retryableOperationInterval, retryableOperationTimeout, true, func(ctx context.Context) (bool, error) {
 			err := input.WorkloadClusterGetter.Get(ctx, client.ObjectKey{Name: instance.Name}, node)
 			if err != nil {
 				return false, nil //nolint:nilerr
diff --git a/test/infrastructure/docker/internal/docker/machine.go b/test/infrastructure/docker/internal/docker/machine.go
@@ -255,7 +255,7 @@ func (m *Machine) Create(ctx context.Context, image string, role string, version
 		}
 		// After creating a node we need to wait a small amount of time until crictl does not return an error.
 		// This fixes an issue where we try to kubeadm init too quickly after creating the container.
-		err = wait.PollImmediate(500*time.Millisecond, 4*time.Second, func() (bool, error) {
+		err = wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 4*time.Second, true, func(ctx context.Context) (bool, error) {
 			ps := m.container.Commander.Command("crictl", "ps")
 			return ps.Run(ctx) == nil, nil
 		})
diff --git a/util/retry.go b/util/retry.go
@@ -49,12 +49,18 @@ func Retry(fn wait.ConditionFunc, initialBackoffSec int) error {
 
 // Poll tries a condition func until it returns true, an error, or the timeout
 // is reached.
+//
+// Deprecated: This function has been deprecated and will be removed in a future release.
+// Please use utils from "k8s.io/apimachinery/pkg/util/wait" instead.
 func Poll(interval, timeout time.Duration, condition wait.ConditionFunc) error {
 	return wait.Poll(interval, timeout, condition)
 }
 
 // PollImmediate tries a condition func until it returns true, an error, or the timeout
 // is reached.
+//
+// Deprecated: This function has been deprecated and will be removed in a future release.
+// Please use utils from "k8s.io/apimachinery/pkg/util/wait" instead.
 func PollImmediate(interval, timeout time.Duration, condition wait.ConditionFunc) error {
 	return wait.PollImmediate(interval, timeout, condition)
 }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ limitations under the License.`
`17`	`17`	`package client`
`18`	`18`
`19`	`19`	`import (`
	`20`	`+ "context"`
`20`	`21`	`"fmt"`
`21`	`22`	`"testing"`
`22`	`23`	`"time"`
`@@ -209,7 +210,7 @@ func newFakeCluster(kubeconfig cluster.Kubeconfig, configClient config.Client) *`
`209`	`210`	`}`
`210`	`211`
`211`	`212`	`fake.fakeProxy = test.NewFakeProxy()`
`212`		`- pollImmediateWaiter := func(interval, timeout time.Duration, condition wait.ConditionFunc) error {`
	`213`	`+ pollImmediateWaiter := func(ctx context.Context, interval, timeout time.Duration, condition wait.ConditionWithContextFunc) error {`
`213`	`214`	`return nil`
`214`	`215`	`}`
`215`	`216`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ func waitManagerDeploymentsReady(opts InstallOptions, installQueue []repository.`
`141`	`141`	`for _, obj := range components.Objs() {`
`142`	`142`	`if util.IsDeploymentWithManager(obj) {`
`143`	`143`	`if err := waitDeploymentReady(obj, opts.WaitProviderTimeout, proxy); err != nil {`
`144`		`- return err`
	`144`	`+ return errors.Wrapf(err, "deployment %q is not ready after %s", obj.GetName(), opts.WaitProviderTimeout)`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`	`}`
`@@ -150,7 +150,7 @@ func waitManagerDeploymentsReady(opts InstallOptions, installQueue []repository.`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`func waitDeploymentReady(deployment unstructured.Unstructured, timeout time.Duration, proxy Proxy) error {`
`153`		`- return wait.Poll(100*time.Millisecond, timeout, func() (bool, error) {`
	`153`	`+ return wait.PollUntilContextTimeout(context.TODO(), 100*time.Millisecond, timeout, false, func(ctx context.Context) (bool, error) {`
`154`	`154`	`c, err := proxy.NewClient()`
`155`	`155`	`if err != nil {`
`156`	`156`	`return false, err`
`@@ -160,7 +160,7 @@ func waitDeploymentReady(deployment unstructured.Unstructured, timeout time.Dura`
`160`	`160`	`Name: deployment.GetName(),`
`161`	`161`	`}`
`162`	`162`	`dep := &appsv1.Deployment{}`
`163`		`- if err := c.Get(context.TODO(), key, dep); err != nil {`
	`163`	`+ if err := c.Get(ctx, key, dep); err != nil {`
`164`	`164`	`return false, err`
`165`	`165`	`}`
`166`	`166`	`for _, c := range dep.Status.Conditions {`
Original file line number	Diff line number	Diff line change
`@@ -567,11 +567,11 @@ func (t topologyClient) defaultAndValidateObjs(ctx context.Context, objs []uns`
`567`	`567`	`}`
`568`	`568`	`}`
`569`	`569`	`if oldObject != nil {`
`570`		`- if err := validator.ValidateUpdate(ctx, oldObject, object); err != nil {`
	`570`	`+ if _, err := validator.ValidateUpdate(ctx, oldObject, object); err != nil {`
`571`	`571`	`return errors.Wrapf(err, "failed validation of %s %s/%s", obj.GroupVersionKind().String(), obj.GetNamespace(), obj.GetName())`
`572`	`572`	`}`
`573`	`573`	`} else {`
`574`		`- if err := validator.ValidateCreate(ctx, object); err != nil {`
	`574`	`+ if _, err := validator.ValidateCreate(ctx, object); err != nil {`
`575`	`575`	`return errors.Wrapf(err, "failed validation of %s %s/%s", obj.GroupVersionKind().String(), obj.GetNamespace(), obj.GetName())`
`576`	`576`	`}`
`577`	`577`	`}`