Skip to content

Commit 1c16b6f

Browse files
committed
enable more conformance tests
Signed-off-by: Tim Ramlot <[email protected]>
1 parent 1376db3 commit 1c16b6f

File tree

3 files changed

+3
-18
lines changed

3 files changed

+3
-18
lines changed

internal/testsetups/simple/controller/signer.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ func (Signer) Sign(ctx context.Context, cr signer.CertificateRequestObject, issu
8282
NotBefore: time.Now(),
8383
NotAfter: time.Now().Add(time.Hour * 24 * 180),
8484

85-
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
86-
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
85+
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
8786
BasicConstraintsValid: true,
8887
}
8988

internal/testsetups/simple/e2e/conformance/conformance.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ var _ = framework.ConformanceDescribe("Certificates", func() {
2626
kubeClients := testresource.KubeClients(t, ctx)
2727

2828
unsupportedFeatures := featureset.NewFeatureSet(
29-
featureset.DurationFeature,
30-
featureset.KeyUsagesFeature,
3129
featureset.SaveCAToSecret,
32-
featureset.Ed25519FeatureSet,
33-
featureset.IssueCAFeature,
34-
featureset.LiteralSubjectFeature,
3530
)
3631

3732
issuerBuilder := newIssuerBuilder("SimpleIssuer")
@@ -59,12 +54,7 @@ var _ = framework.ConformanceDescribe("CertificateSigningRequests", func() {
5954
kubeClients := testresource.KubeClients(t, ctx)
6055

6156
unsupportedFeatures := featureset.NewFeatureSet(
62-
featureset.DurationFeature,
63-
featureset.KeyUsagesFeature,
6457
featureset.SaveCAToSecret,
65-
featureset.Ed25519FeatureSet,
66-
featureset.IssueCAFeature,
67-
featureset.LiteralSubjectFeature,
6858
)
6959

7060
clusterIssuerBuilder := newIssuerBuilder("SimpleClusterIssuer")
@@ -93,12 +83,7 @@ var _ = framework.ConformanceDescribe("RBAC", func() {
9383
kubeClients := testresource.KubeClients(t, ctx)
9484

9585
unsupportedFeatures := featureset.NewFeatureSet(
96-
featureset.DurationFeature,
97-
featureset.KeyUsagesFeature,
9886
featureset.SaveCAToSecret,
99-
featureset.Ed25519FeatureSet,
100-
featureset.IssueCAFeature,
101-
featureset.LiteralSubjectFeature,
10287
)
10388

10489
issuerBuilder := newIssuerBuilder("SimpleIssuer")

make/e2e-setup.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ e2e-setup-cert-manager: | kind-cluster images $(NEEDS_HELM) $(NEEDS_KUBECTL)
7878
--namespace cert-manager \
7979
--repo https://charts.jetstack.io \
8080
--set installCRDs=true \
81-
--set featureGates=ServerSideApply=true \
81+
--set featureGates=ServerSideApply=true,LiteralCertificateSubject=true \
82+
--set webhook.featureGates=ServerSideApply=true,LiteralCertificateSubject=true \
8283
--set image.repository=$(quay.io/jetstack/cert-manager-controller.REPO) \
8384
--set image.tag=$(quay.io/jetstack/cert-manager-controller.TAG) \
8485
--set image.pullPolicy=Never \

0 commit comments

Comments
 (0)