Skip to content

Commit 2bd2f32

Browse files
Super Usercursoragent
andcommitted
e2e: use dedicated vaultSetupTimeout for Vault issuer setup
Vault BeforeEach setup chains TLS cert, Helm, and pod init waits that can exceed highTimeout on slow CI. Use a separate 30m context for setupVaultServer and configureVaultPKI while keeping highTimeout for per-test issuer work. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 2229d50 commit 2bd2f32

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

test/e2e/issuer_vault_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,12 @@ var _ = Describe("Vault Issuer", Ordered, Label("Platform:Generic"), func() {
117117
})
118118

119119
By("setting up Vault server in cluster with PKI secrets engine enabled")
120+
setupCtx, setupCancel := context.WithTimeout(context.Background(), vaultSetupTimeout)
121+
defer setupCancel()
122+
120123
vaultReleaseName := "vault-" + randomStr(4)
121124
var clusterRoleBindingName string
122-
vaultPodName, vaultRootToken, clusterRoleBindingName, err = setupVaultServer(ctx, cfg, loader, certmanagerClient, ns.Name, vaultReleaseName)
125+
vaultPodName, vaultRootToken, clusterRoleBindingName, err = setupVaultServer(setupCtx, cfg, loader, certmanagerClient, ns.Name, vaultReleaseName)
123126
Expect(err).NotTo(HaveOccurred())
124127
Expect(vaultPodName).NotTo(BeEmpty())
125128
Expect(vaultRootToken).NotTo(BeEmpty())
@@ -135,7 +138,7 @@ var _ = Describe("Vault Issuer", Ordered, Label("Platform:Generic"), func() {
135138
vaultServiceURL = fmt.Sprintf("https://%s.%s.svc:8200", vaultReleaseName, ns.Name)
136139

137140
By("configuring Vault PKI engine")
138-
err = configureVaultPKI(ctx, cfg, loader, ns.Name, vaultPodName, vaultRootToken)
141+
err = configureVaultPKI(setupCtx, cfg, loader, ns.Name, vaultPodName, vaultRootToken)
139142
Expect(err).NotTo(HaveOccurred())
140143
})
141144

test/e2e/utils_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ var (
7373
slowPollInterval = 12 * time.Second
7474
highTimeout = 10 * time.Minute
7575

76+
// vaultSetupTimeout covers chained setup in setupVaultServer (TLS cert, Helm, pod init)
77+
// and configureVaultPKI, which can exceed highTimeout on slow CI clusters.
78+
vaultSetupTimeout = 30 * time.Minute
79+
7680
// fastPollInterval and lowTimeout are
7781
// used together in poll(s) with fast reaction and
7882
// smaller timeout window.

0 commit comments

Comments
 (0)