From 819cb0fe775a9f68b2291c02af1b3f498a8c1762 Mon Sep 17 00:00:00 2001 From: Yury Kulazhenkov Date: Tue, 21 Nov 2023 19:29:53 +0200 Subject: [PATCH] Remove usage of deprecated wait.Poll function The function is replaced with wait.PollUntilContextTimeout Signed-off-by: Yury Kulazhenkov --- pkg/state/state_ofed.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkg/state/state_ofed.go b/pkg/state/state_ofed.go index 0b1c04d6..fb5167c4 100644 --- a/pkg/state/state_ofed.go +++ b/pkg/state/state_ofed.go @@ -553,18 +553,19 @@ func (s *stateOFED) getOrCreateTrustedCAConfigMap( "name", cmName, "namespace", cmNamespace) // check that CA bundle is populated by Openshift before proceed - err = wait.Poll(ocpTrustedCAConfigMapCheckInterval, ocpTrustedCAConfigMapCheckTimeout, func() (bool, error) { - err := s.client.Get(ctx, types.NamespacedName{Namespace: cmNamespace, Name: cmName}, configMap) - if err != nil { - if apiErrors.IsNotFound(err) { - return false, nil + err = wait.PollUntilContextTimeout(ctx, ocpTrustedCAConfigMapCheckInterval, + ocpTrustedCAConfigMapCheckTimeout, true, func(innerCtx context.Context) (bool, error) { + err := s.client.Get(innerCtx, types.NamespacedName{Namespace: cmNamespace, Name: cmName}, configMap) + if err != nil { + if apiErrors.IsNotFound(err) { + return false, nil + } + return false, err } - return false, err - } - return configMap.Data[ocpTrustedCABundleFileName] != "", nil - }) + return configMap.Data[ocpTrustedCABundleFileName] != "", nil + }) if err != nil { - if !errors.Is(err, wait.ErrWaitTimeout) { + if !wait.Interrupted(err) { return nil, errors.Wrap(err, "failed to check TrustedCAConfigMap content") } reqLogger.V(consts.LogLevelWarning).Info("TrustedCAConfigMap was not populated by Openshift,"+