diff --git a/test/e2e/framework/addon/vault/setup.go b/test/e2e/framework/addon/vault/setup.go index 8a2fa4ec4..6c37da816 100644 --- a/test/e2e/framework/addon/vault/setup.go +++ b/test/e2e/framework/addon/vault/setup.go @@ -299,7 +299,7 @@ func (v *VaultInitializer) mountPKI(mount, ttl string) error { func (v *VaultInitializer) generateRootCert() (string, error) { params := map[string]string{ "common_name": "Root CA", - "ttl": "87600h", + "ttl": "2160h", "exclude_cn_from_sans": "true", "key_type": "ec", "key_bits": "256", diff --git a/test/e2e/suite/conformance/certificatesigningrequests/vault/approle.go b/test/e2e/suite/conformance/certificatesigningrequests/vault/approle.go index 541d5fa7a..5b247d639 100644 --- a/test/e2e/suite/conformance/certificatesigningrequests/vault/approle.go +++ b/test/e2e/suite/conformance/certificatesigningrequests/vault/approle.go @@ -192,6 +192,7 @@ func (a *approle) initVault(f *framework.Framework) *secrets { IntermediateMount: intermediateMount, ConfigureWithRoot: a.testWithRootCA, Role: role, + AppRoleAuthPath: a.authPath, } Expect(a.initializer.Init()).NotTo(HaveOccurred(), "failed to init vault") Expect(a.initializer.Setup()).NotTo(HaveOccurred(), "failed to setup vault") diff --git a/test/e2e/suite/conformance/certificatesigningrequests/vault/approle_custom_mount.go b/test/e2e/suite/conformance/certificatesigningrequests/vault/approle_custom_mount.go index acea98cea..627a8c374 100644 --- a/test/e2e/suite/conformance/certificatesigningrequests/vault/approle_custom_mount.go +++ b/test/e2e/suite/conformance/certificatesigningrequests/vault/approle_custom_mount.go @@ -38,6 +38,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { issuerNoRoot := &approle{ testWithRootCA: false, + authPath: customAuthPath, } (&certificatesigningrequests.Suite{ Name: "Vault AppRole Custom Auth Path Issuer Without Root CA", @@ -51,6 +52,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { clusterIssuer := &approle{ testWithRootCA: true, + authPath: customAuthPath, } (&certificatesigningrequests.Suite{ Name: "Vault AppRole Custom Auth Path ClusterIssuer With Root CA", @@ -63,6 +65,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { clusterIssuerNoRoot := &approle{ testWithRootCA: false, + authPath: customAuthPath, } (&certificatesigningrequests.Suite{ Name: "Vault AppRole Custom Auth Path ClusterIssuer Without Root CA",