weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Use feature gate shared map for determining whether secret template

Browse Source 
tests should run

Signed-off-by: joshvanl <vleeuwenjoshua@gmail.com>
This commit is contained in:
joshvanl 2022-01-05 11:35:29 +00:00
parent d6fb5138f2
commit a9bd3f37dc
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/run-e2e.sh
View File

@ -49,7 +49,7 @@ if [[ -n "$GINKGO_FOCUS" ]]; then GINKGO_FOCUS="--ginkgo.focus=${GINKGO_FOCUS}";
if [[ -n "$GINKGO_SKIP" ]]; then GINKGO_SKIP="--ginkgo.skip=${GINKGO_SKIP}"; fi
# Default feature gates to enable
FEATURE_GATES="${FEATURE_GATES:-ExperimentalCertificateSigningRequestControllers=true,ExperimentalGatewayAPISupport=true}"
FEATURE_GATES="${FEATURE_GATES:-ExperimentalCertificateSigningRequestControllers=true,ExperimentalGatewayAPISupport=true,ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO=true}"
# Configure PATH to use bazel provided e2e tools
setup_tools

2
test/e2e/suite/secrettemplate/BUILD.bazel
View File

@ -9,7 +9,7 @@ go_library(
"//pkg/apis/certmanager/v1:go_default_library",
"//pkg/apis/meta/v1:go_default_library",
"//pkg/feature:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/feature:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/util:go_default_library",
"//test/unit/gen:go_default_library",

6
test/e2e/suite/secrettemplate/secrettemplate.go
View File

@ -19,7 +19,6 @@ package secrettemplate
import (
"bytes"
"context"
"os"
"strings"
"time"
@ -33,7 +32,7 @@ import (
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
"github.com/jetstack/cert-manager/pkg/feature"
"github.com/jetstack/cert-manager/pkg/util"
utilfeature "github.com/jetstack/cert-manager/pkg/util/feature"
"github.com/jetstack/cert-manager/test/e2e/framework"
e2eutil "github.com/jetstack/cert-manager/test/e2e/util"
"github.com/jetstack/cert-manager/test/unit/gen"
@ -53,8 +52,7 @@ var _ = framework.CertManagerDescribe("Certificate SecretTemplate", func() {
// Only run tests if the SecretTemplate feature is enabled. Skip otherwise.
it := func(name string, testfn func()) {
It(name, func() {
fgs := os.Getenv("FEATURE_GATES")
if !util.Contains(strings.Split(fgs, ","), string(feature.ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO)+"=true") {
if !utilfeature.DefaultFeatureGate.Enabled(feature.ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO) {
framework.Skipf("skipping Certificates SecretTemplate controller test since FEATURE_GATE %s is not enabled",
feature.ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO)
return