Increase go test timeout and minor cleanups

Author: lunarwhite

Makefile

@@ -104,7 +104,7 @@ COMMIT ?= $(shell git rev-parse HEAD)
 SHORTCOMMIT ?= $(shell git rev-parse --short HEAD)
 GOBUILD_VERSION_ARGS = -ldflags "-X $(PACKAGE)/pkg/version.SHORTCOMMIT=$(SHORTCOMMIT) -X $(PACKAGE)/pkg/version.COMMIT=$(COMMIT)"
 
-E2E_TIMEOUT ?= 1h
+E2E_TIMEOUT ?= 2h
 # E2E_GINKGO_LABEL_FILTER is ginkgo label query for selecting tests. See
 # https://onsi.github.io/ginkgo/#spec-labels. The default is to run tests on the AWS platform.
 E2E_GINKGO_LABEL_FILTER ?= "Platform: isSubsetOf {AWS} && CredentialsMode: isSubsetOf {Mint}"

test/e2e/istio_csr_test.go

@@ -26,9 +26,6 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-// backOffLimit is the max retries for the Job
-const backOffLimit int32 = 10
-
 // istioCSRProtoURL links to proto for istio-csr API spec
 const istioCSRProtoURL = "https://raw.githubusercontent.com/istio/api/v1.24.1/security/v1alpha1/ca.proto"
 

test/e2e/suite_test.go

@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -93,6 +94,11 @@ func TestAll(t *testing.T) {
 
 	suiteConfig, reportConfig := GinkgoConfiguration()
 
+	suiteConfig.Timeout = 120 * time.Minute // Set Ginkgo suite-level timeout
+	suiteConfig.FailFast = false            // Continue after first failure to see all issues
+	suiteConfig.FlakeAttempts = 0           // Retry on flaky tests (helpful when deflaking tests)
+	suiteConfig.MustPassRepeatedly = 1      // Must pass repeatedly times (helpful when deflaking tests)
+
 	testDir := getTestDir()
 	reportConfig.JSONReport = filepath.Join(testDir, "report.json")
 	reportConfig.JUnitReport = filepath.Join(testDir, "junit.xml")
@@ -146,6 +152,6 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 
 	By("setting defaultNetworkPolicy to true")
-	err = resetCertManagerNetworkPolicyState(context.TODO(), certmanageroperatorclient, loader)
+	err = resetCertManagerNetworkPolicyState(context.TODO(), certmanageroperatorclient)
 	Expect(err).NotTo(HaveOccurred())
 })

test/e2e/utils_test.go

@@ -850,7 +850,7 @@ func verifyCertificateRenewed(ctx context.Context, secretName, namespace string,
 		}
 
 		// checks if expiry time was updated
-		if *initExpiryTime == cert.NotAfter {
+		if (*initExpiryTime).Equal(cert.NotAfter) {
 			return false, nil
 		}
 
@@ -1124,7 +1124,7 @@ func VerifyContainerResources(pod corev1.Pod, containerName string, expectedReso
 }
 
 // resetCertManagerNetworkPolicyState resets the CertManager to have defaultNetworkPolicy="true"
-func resetCertManagerNetworkPolicyState(ctx context.Context, client *certmanoperatorclient.Clientset, loader library.DynamicResourceLoader) error {
+func resetCertManagerNetworkPolicyState(ctx context.Context, client *certmanoperatorclient.Clientset) error {
 	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
 		var operatorState *v1alpha1.CertManager
 		err := wait.PollUntilContextTimeout(context.TODO(), slowPollInterval, highTimeout, true, func(context.Context) (bool, error) {