Revert e2e vault setup to use original max certificate TTL, and fix

custom app role auth path in CSR tests

Signed-off-by: joshvanl <vleeuwenjoshua@gmail.com>

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",

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")

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",