Merge pull request #29172 from vrutkovs/tls-collection-complete

API-1689: tls registry: extend time for cert collection pod to start
openshift · Nov 19, 2024 · 18dfac1 · 18dfac1
2 parents 0163f3b + 943d92f
commit 18dfac1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/pkg/monitortests/network/disruptionpodnetwork/utils.go b/pkg/monitortests/network/disruptionpodnetwork/utils.go
@@ -3,12 +3,15 @@ package disruptionpodnetwork
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"strings"
+	"time"
+
+	"github.com/sirupsen/logrus"
 
 	configclient "github.com/openshift/client-go/config/clientset/versioned"
 	exutil "github.com/openshift/origin/test/extended/util"
@@ -136,3 +139,21 @@ func GetOpenshiftTestsImagePullSpec(ctx context.Context, adminRESTConfig *rest.C
 
 	return openshiftTestsImagePullSpec, nil
 }
+
+func GetOpenshiftTestsImagePullSpecWithRetries(ctx context.Context, adminRESTConfig *rest.Config, suggestedPayloadImage string, oc *exutil.CLI, retries int) (string, error) {
+	var errs []error
+
+	for i := 0; i < retries; i++ {
+		result, err := GetOpenshiftTestsImagePullSpec(ctx, adminRESTConfig, suggestedPayloadImage, oc)
+		if err == nil {
+			return result, nil
+		}
+		select {
+		case <-ctx.Done():
+			return "", ctx.Err()
+		case <-time.After(30 * time.Second):
+		}
+		errs = append(errs, err)
+	}
+	return "", errors.Join(errs...)
+}
diff --git a/test/extended/operators/certs.go b/test/extended/operators/certs.go
@@ -117,7 +117,7 @@ var _ = g.Describe(fmt.Sprintf("[sig-arch][Late][Jira:%q]", "kube-apiserver"), g
 		inClusterPKIContent, err := gatherCertsFromPlatformNamespaces(ctx, kubeClient, masters, bootstrapHostname)
 		o.Expect(err).NotTo(o.HaveOccurred())
 
-		openshiftTestImagePullSpec, err := disruptionpodnetwork.GetOpenshiftTestsImagePullSpec(ctx, oc.AdminConfig(), "", oc)
+		openshiftTestImagePullSpec, err := disruptionpodnetwork.GetOpenshiftTestsImagePullSpecWithRetries(ctx, oc.AdminConfig(), "", oc, 5)
 		// Skip metal jobs if test image pullspec cannot be determined
 		if jobType.Platform != "metal" || err == nil {
 			o.Expect(err).NotTo(o.HaveOccurred())
@@ -385,7 +385,7 @@ func createPods(ctx context.Context, kubeClient kubernetes.Interface, namespace
 			return podOnNode, fmt.Errorf("error creating pod on node %s: %v", node.Name, err)
 		}
 
-		timeLimitedCtx, cancel := context.WithTimeout(ctx, time.Minute)
+		timeLimitedCtx, cancel := context.WithTimeout(ctx, 5*time.Minute)
 		defer cancel()
 
 		if _, watchErr := watchtools.UntilWithSync(timeLimitedCtx,