github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

e2e/apimachinery/watchlist: uses SetFeatureDuringTest

Browse Source
This commit is contained in:
Lukasz Szaszkiewicz 2024-05-23 16:42:21 +02:00
parent 8c0c1f7201
commit ba89ae3ddf
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/e2e/apimachinery/watchlist.go
View File

@ -30,8 +30,11 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
utilfeature "k8s.io/apiserver/pkg/util/feature"
clientfeatures "k8s.io/client-go/features" clientfeatures "k8s.io/client-go/features"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"k8s.io/component-base/featuregate"
featuregatetesting "k8s.io/component-base/featuregate/testing"
"k8s.io/kubernetes/test/e2e/feature" "k8s.io/kubernetes/test/e2e/feature"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
) )
@ -39,13 +42,7 @@ import (
var _ = SIGDescribe("API Streaming (aka. WatchList)", framework.WithSerial(), feature.WatchList, func() { var _ = SIGDescribe("API Streaming (aka. WatchList)", framework.WithSerial(), feature.WatchList, func() {
f := framework.NewDefaultFramework("watchlist") f := framework.NewDefaultFramework("watchlist")
ginkgo.It("should be requested when WatchListClient is enabled", func(ctx context.Context) { ginkgo.It("should be requested when WatchListClient is enabled", func(ctx context.Context) {
// TODO(p0lyn0mial): use https://github.com/kubernetes/kubernetes/pull/123974 featuregatetesting.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), utilfeature.DefaultFeatureGate, featuregate.Feature(clientfeatures.WatchListClient), true)
// instead of using directly clientfeatures.ReplaceFeatureGates
prevClientFeatureGates := clientfeatures.FeatureGates()
defer func() {
clientfeatures.ReplaceFeatureGates(prevClientFeatureGates)
}()
clientfeatures.ReplaceFeatureGates(newEnabledWatchListClientFeatureGateRegistry(prevClientFeatureGates))
stopCh := make(chan struct{}) stopCh := make(chan struct{})
defer close(stopCh) defer close(stopCh)
secretInformer := cache.NewSharedIndexInformer( secretInformer := cache.NewSharedIndexInformer(
@ -121,18 +118,3 @@ func newSecret(name string) *v1.Secret {
ObjectMeta: metav1.ObjectMeta{Name: name}, ObjectMeta: metav1.ObjectMeta{Name: name},
} }
} }
type enabledWatchListClientFeatureGateRegistry struct {
originalGates clientfeatures.Gates
}
func newEnabledWatchListClientFeatureGateRegistry(originalGates clientfeatures.Gates) *enabledWatchListClientFeatureGateRegistry {
return &enabledWatchListClientFeatureGateRegistry{originalGates: originalGates}
}
func (r *enabledWatchListClientFeatureGateRegistry) Enabled(feature clientfeatures.Feature) bool {
if feature == clientfeatures.WatchListClient {
return true
}
return r.originalGates.Enabled(feature)
}