From 111768ffb7d989f5b974184b9fbed28d2ba33d2f Mon Sep 17 00:00:00 2001 From: Erik Godding Boye Date: Thu, 2 May 2024 11:19:43 +0200 Subject: [PATCH] Revert removal of required feature gate gating e2e-tests Signed-off-by: Erik Godding Boye --- test/e2e/suite/certificates/additionaloutputformats.go | 2 ++ test/e2e/suite/issuers/ca/certificate.go | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/test/e2e/suite/certificates/additionaloutputformats.go b/test/e2e/suite/certificates/additionaloutputformats.go index c4f1d5ab8..28ce4ff01 100644 --- a/test/e2e/suite/certificates/additionaloutputformats.go +++ b/test/e2e/suite/certificates/additionaloutputformats.go @@ -51,6 +51,8 @@ var _ = framework.CertManagerDescribe("Certificate AdditionalCertificateOutputFo ) createCertificate := func(f *framework.Framework, aof []cmapi.CertificateAdditionalOutputFormat) (string, *cmapi.Certificate) { + framework.RequireFeatureGate(f, utilfeature.DefaultFeatureGate, feature.AdditionalCertificateOutputFormats) + crt := &cmapi.Certificate{ ObjectMeta: metav1.ObjectMeta{ GenerateName: "test-additional-output-formats-", diff --git a/test/e2e/suite/issuers/ca/certificate.go b/test/e2e/suite/issuers/ca/certificate.go index 945bfae08..ae8f455ff 100644 --- a/test/e2e/suite/issuers/ca/certificate.go +++ b/test/e2e/suite/issuers/ca/certificate.go @@ -24,8 +24,10 @@ import ( "github.com/cert-manager/cert-manager/e2e-tests/framework" "github.com/cert-manager/cert-manager/e2e-tests/util" + "github.com/cert-manager/cert-manager/internal/controller/feature" v1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1" + utilfeature "github.com/cert-manager/cert-manager/pkg/util/feature" "github.com/cert-manager/cert-manager/test/unit/gen" . "github.com/onsi/ginkgo/v2" @@ -152,6 +154,10 @@ var _ = framework.CertManagerDescribe("CA Certificate", func() { }) It("should be able to create a certificate with additional output formats", func() { + // Output formats is only enabled via this feature gate being enabled. + // Don't run test if the gate isn't enabled. + framework.RequireFeatureGate(f, utilfeature.DefaultFeatureGate, feature.AdditionalCertificateOutputFormats) + certClient := f.CertManagerClientSet.CertmanagerV1().Certificates(f.Namespace.Name) By("Creating a Certificate")