diff --git a/test/e2e/framework/addon/vault/setup.go b/test/e2e/framework/addon/vault/setup.go index 6c37da816..8a2fa4ec4 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": "2160h", + "ttl": "87600h", "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 5b247d639..ec5599af3 100644 --- a/test/e2e/suite/conformance/certificatesigningrequests/vault/approle.go +++ b/test/e2e/suite/conformance/certificatesigningrequests/vault/approle.go @@ -73,6 +73,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { DeleteIssuerFunc: issuer.delete, UnsupportedFeatures: featureset.NewFeatureSet( featureset.KeyUsagesFeature, + featureset.Ed25519FeatureSet, ), }).Define() @@ -87,6 +88,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { UnsupportedFeatures: featureset.NewFeatureSet( featureset.SaveRootCAToSecret, featureset.KeyUsagesFeature, + featureset.Ed25519FeatureSet, ), }).Define() @@ -100,6 +102,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { DeleteIssuerFunc: clusterIssuer.delete, UnsupportedFeatures: featureset.NewFeatureSet( featureset.KeyUsagesFeature, + featureset.Ed25519FeatureSet, ), }).Define() @@ -114,6 +117,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { UnsupportedFeatures: featureset.NewFeatureSet( featureset.SaveRootCAToSecret, featureset.KeyUsagesFeature, + featureset.Ed25519FeatureSet, ), }).Define() }) 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 627a8c374..b02735326 100644 --- a/test/e2e/suite/conformance/certificatesigningrequests/vault/approle_custom_mount.go +++ b/test/e2e/suite/conformance/certificatesigningrequests/vault/approle_custom_mount.go @@ -33,6 +33,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { DeleteIssuerFunc: issuer.delete, UnsupportedFeatures: featureset.NewFeatureSet( featureset.KeyUsagesFeature, + featureset.Ed25519FeatureSet, ), }).Define() @@ -47,6 +48,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { UnsupportedFeatures: featureset.NewFeatureSet( featureset.SaveRootCAToSecret, featureset.KeyUsagesFeature, + featureset.Ed25519FeatureSet, ), }).Define() @@ -60,6 +62,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { DeleteIssuerFunc: clusterIssuer.delete, UnsupportedFeatures: featureset.NewFeatureSet( featureset.KeyUsagesFeature, + featureset.Ed25519FeatureSet, ), }).Define() @@ -74,6 +77,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { UnsupportedFeatures: featureset.NewFeatureSet( featureset.SaveRootCAToSecret, featureset.KeyUsagesFeature, + featureset.Ed25519FeatureSet, ), }).Define() }) diff --git a/test/e2e/suite/conformance/certificatesigningrequests/vault/kubernetes.go b/test/e2e/suite/conformance/certificatesigningrequests/vault/kubernetes.go index 214d3f0bc..cd8996b21 100644 --- a/test/e2e/suite/conformance/certificatesigningrequests/vault/kubernetes.go +++ b/test/e2e/suite/conformance/certificatesigningrequests/vault/kubernetes.go @@ -46,6 +46,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { DeleteIssuerFunc: issuer.delete, UnsupportedFeatures: featureset.NewFeatureSet( featureset.KeyUsagesFeature, + featureset.Ed25519FeatureSet, ), }).Define() @@ -58,6 +59,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() { DeleteIssuerFunc: clusterIssuer.delete, UnsupportedFeatures: featureset.NewFeatureSet( featureset.KeyUsagesFeature, + featureset.Ed25519FeatureSet, ), }).Define() })