Skip to content

Commit 628d107

Browse files
liggittBenTheElder
authored andcommitted
Switch cluster trust bundle e2e tests to generic alpha feature + feature gates
This relies on WithFeatureGate adding [Feature:OffByDefault]. Without that, the test would start to run in jobs which don't enable the feature.
1 parent 9828ad6 commit 628d107

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

test/e2e/auth/projected_clustertrustbundle.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
"k8s.io/apimachinery/pkg/util/uuid"
4040
"k8s.io/apimachinery/pkg/util/wait"
4141
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
42-
"k8s.io/kubernetes/test/e2e/feature"
42+
"k8s.io/kubernetes/pkg/features"
4343
"k8s.io/kubernetes/test/e2e/framework"
4444
e2epodoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
4545
imageutils "k8s.io/kubernetes/test/utils/image"
@@ -57,7 +57,7 @@ const (
5757
noSignerKey = "no-signer"
5858
)
5959

60-
var _ = SIGDescribe(feature.ClusterTrustBundle, feature.ClusterTrustBundleProjection, func() {
60+
var _ = SIGDescribe(framework.WithFeatureGate(features.ClusterTrustBundle), framework.WithFeatureGate(features.ClusterTrustBundleProjection), func() {
6161
f := framework.NewDefaultFramework("projected-clustertrustbundle")
6262
f.NamespacePodSecurityLevel = admissionapi.LevelBaseline
6363

test/e2e/feature/feature.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ var (
6060
// Owner: sig-autoscaling
6161
ClusterSizeAutoscalingScaleUp = framework.WithFeature(framework.ValidFeatures.Add("ClusterSizeAutoscalingScaleUp"))
6262

63-
// TODO: document the feature (owning SIG, when to use this feature for a test)
64-
ClusterTrustBundle = framework.WithFeature(framework.ValidFeatures.Add("ClusterTrustBundle"))
65-
66-
// TODO: document the feature (owning SIG, when to use this feature for a test)
67-
ClusterTrustBundleProjection = framework.WithFeature(framework.ValidFeatures.Add("ClusterTrustBundleProjection"))
68-
6963
// TODO: document the feature (owning SIG, when to use this feature for a test)
7064
ClusterUpgrade = framework.WithFeature(framework.ValidFeatures.Add("ClusterUpgrade"))
7165

0 commit comments

Comments
 (0)