@@ -10,6 +10,7 @@ import (
1010 "os"
1111 "strconv"
1212 "strings"
13+ "time"
1314
1415 "github.com/openshift/external-dns-operator/test/common"
1516
@@ -19,6 +20,7 @@ import (
1920 appsv1 "k8s.io/api/apps/v1"
2021 corev1 "k8s.io/api/core/v1"
2122 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
23+ "k8s.io/apimachinery/pkg/util/wait"
2224 "sigs.k8s.io/controller-runtime/pkg/client"
2325
2426 operatorv1alpha1 "github.com/openshift/external-dns-operator/api/v1alpha1"
@@ -267,9 +269,9 @@ func (h *infobloxTestHelper) trustGridTLSCert() error {
267269 }
268270
269271 // inject into subscription if there is one
270- findOperatorSubscription := func () (* olmv1alpha1.Subscription , error ) {
272+ findOperatorSubscription := func (ctx context. Context ) (* olmv1alpha1.Subscription , error ) {
271273 list := & olmv1alpha1.SubscriptionList {}
272- if err := common .KubeClient .List (context . TODO () , list , client .InNamespace (operatorNs )); err != nil {
274+ if err := common .KubeClient .List (ctx , list , client .InNamespace (operatorNs )); err != nil {
273275 return nil , err
274276 }
275277 for _ , sub := range list .Items {
@@ -284,25 +286,33 @@ func (h *infobloxTestHelper) trustGridTLSCert() error {
284286 }
285287 return nil , nil
286288 }
287- subscription , err := findOperatorSubscription ()
288- if err != nil {
289- return fmt .Errorf ("failed to find operator subscription: %w" , err )
290- }
291- if subscription != nil {
292- if subscription .Spec .Config == nil {
293- subscription .Spec .Config = & olmv1alpha1.SubscriptionConfig {}
289+
290+ if err := wait .PollUntilContextTimeout (context .TODO (), 2 * time .Second , 1 * time .Minute , true , func (ctx context.Context ) (bool , error ) {
291+ subscription , err := findOperatorSubscription (ctx )
292+ if err != nil {
293+ fmt .Printf ("failed while finding operator subscription: %v, retrying ...\n " , err )
294+ return false , nil
294295 }
295- subscription .Spec .Config .Env = ensureEnvVar (subscription .Spec .Config .Env , trustedCAEnvVar )
296- if err := common .KubeClient .Update (context .TODO (), subscription ); err != nil {
297- return fmt .Errorf ("failed to inject trusted CA environment variable into the subscription: %w" , err )
296+ if subscription != nil {
297+ if subscription .Spec .Config == nil {
298+ subscription .Spec .Config = & olmv1alpha1.SubscriptionConfig {}
299+ }
300+ subscription .Spec .Config .Env = ensureEnvVar (subscription .Spec .Config .Env , trustedCAEnvVar )
301+ if err := common .KubeClient .Update (ctx , subscription ); err != nil {
302+ fmt .Printf ("failed to inject trusted CA environment variable into the subscription: %v, retrying ...\n " , err )
303+ return false , nil
304+ }
305+ return true , nil
298306 }
299- return nil
307+ fmt .Println ("no suscription was found, trying to update the deployment directly" )
308+ return true , nil
309+ }); err != nil {
310+ return fmt .Errorf ("timed out trying to inject trusted CA into the subscription" )
300311 }
301312
302- // no subscription was found, try to update the deployment directly
303- findOperatorDeployment := func () (* appsv1.Deployment , error ) {
313+ findOperatorDeployment := func (ctx context.Context ) (* appsv1.Deployment , error ) {
304314 list := & appsv1.DeploymentList {}
305- if err := common .KubeClient .List (context . TODO () , list , client .InNamespace (operatorNs )); err != nil {
315+ if err := common .KubeClient .List (ctx , list , client .InNamespace (operatorNs )); err != nil {
306316 return nil , err
307317 }
308318 for _ , depl := range list .Items {
@@ -312,22 +322,29 @@ func (h *infobloxTestHelper) trustGridTLSCert() error {
312322 }
313323 return nil , nil
314324 }
315- deployment , err := findOperatorDeployment ()
316- if err != nil {
317- return fmt .Errorf ("failed to find operator deployment: %w" , err )
318- }
319- if deployment == nil {
320- return fmt .Errorf ("no operator deployment found" )
321- }
325+ if err := wait .PollUntilContextTimeout (context .TODO (), 2 * time .Second , 1 * time .Minute , true , func (ctx context.Context ) (bool , error ) {
326+ deployment , err := findOperatorDeployment (ctx )
327+ if err != nil {
328+ fmt .Printf ("failed while finding operator deployment: %v, retrying ...\n " , err )
329+ return false , nil
330+ }
331+ if deployment == nil {
332+ return false , fmt .Errorf ("no operator deployment found" )
333+ }
322334
323- for i := range deployment .Spec .Template .Spec .Containers {
324- if deployment .Spec .Template .Spec .Containers [i ].Name == operatorContainerName {
325- deployment .Spec .Template .Spec .Containers [i ].Env = ensureEnvVar (deployment .Spec .Template .Spec .Containers [i ].Env , trustedCAEnvVar )
326- break
335+ for i := range deployment .Spec .Template .Spec .Containers {
336+ if deployment .Spec .Template .Spec .Containers [i ].Name == operatorContainerName {
337+ deployment .Spec .Template .Spec .Containers [i ].Env = ensureEnvVar (deployment .Spec .Template .Spec .Containers [i ].Env , trustedCAEnvVar )
338+ break
339+ }
327340 }
328- }
329- if err := common .KubeClient .Update (context .TODO (), deployment ); err != nil {
330- return fmt .Errorf ("failed to inject trusted CA environment variable into the deployment: %w" , err )
341+ if err := common .KubeClient .Update (ctx , deployment ); err != nil {
342+ fmt .Printf ("failed to inject trusted CA environment variable into the deployment: %v\n " , err )
343+ return false , nil
344+ }
345+ return true , nil
346+ }); err != nil {
347+ return fmt .Errorf ("failed trying to inject trusted CA into the subscription: %w" , err )
331348 }
332349
333350 return nil
![openshift-merge-bot[bot]](https://avatars.githubusercontent.com/in/412865?v=4&size=40){kind=avatar}
0 commit comments