kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #123732 from serathius/parallel-featureflags 

Fix SetFeatureGateDuringTest handling of Parallel tests

Kubernetes-commit: e062f925aec9137ca3f06704c6adb2883812e657
This commit is contained in:
Kubernetes Publisher 2024-03-11 13:32:48 -07:00
parent 469611c7d7 3a83dc12eb
commit 07ca000ce9
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
go.mod
View File

@ -43,10 +43,10 @@ require (
google.golang.org/protobuf v1.33.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.0.0-20240309190150-089c7cae4c5d
k8s.io/api v0.0.0-20240311194616-96558b97565e
k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a
k8s.io/client-go v0.0.0-20240309200420-7ebe0ea60e0a
k8s.io/component-base v0.0.0-20240306172020-b0a6e40497ae
k8s.io/component-base v0.0.0-20240312000449-3c774a67a455
k8s.io/klog/v2 v2.120.1
k8s.io/kms v0.0.0-20240306172340-03c9a46c21c7
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
@ -125,9 +125,9 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20240309190150-089c7cae4c5d
k8s.io/api => k8s.io/api v0.0.0-20240311194616-96558b97565e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a
k8s.io/client-go => k8s.io/client-go v0.0.0-20240309200420-7ebe0ea60e0a
k8s.io/component-base => k8s.io/component-base v0.0.0-20240306172020-b0a6e40497ae
k8s.io/component-base => k8s.io/component-base v0.0.0-20240312000449-3c774a67a455
k8s.io/kms => k8s.io/kms v0.0.0-20240306172340-03c9a46c21c7
)

8
go.sum
View File

@ -381,14 +381,14 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20240309190150-089c7cae4c5d h1:+Da06Nik1YMNkEve7HOo7NuzbWiOpLkdouF8Ww1U4Ao=
k8s.io/api v0.0.0-20240309190150-089c7cae4c5d/go.mod h1:RzL8aPQw9ZdVXCdY+Iz3AXnVX+jFyQNqcmzmS+2/Ur0=
k8s.io/api v0.0.0-20240311194616-96558b97565e h1:Z2GqjWWNuM6kr7OiUdpQvs+x7vUU96a+7YdYilq3Ku8=
k8s.io/api v0.0.0-20240311194616-96558b97565e/go.mod h1:RzL8aPQw9ZdVXCdY+Iz3AXnVX+jFyQNqcmzmS+2/Ur0=
k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a h1:0OAuWcxW23YggVeW/f7sDWuEF2U4HDVSN+CQNMxwimI=
k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y=
k8s.io/client-go v0.0.0-20240309200420-7ebe0ea60e0a h1:EMeP7Xj22C0bpj+nV6cxqBExDijGzRKs66AY4NDStYw=
k8s.io/client-go v0.0.0-20240309200420-7ebe0ea60e0a/go.mod h1:QDFa4l0JGh2EmATyNXW9l58yiTy4DIoVjrfyNgOxfOQ=
k8s.io/component-base v0.0.0-20240306172020-b0a6e40497ae h1:/bnYoyvHvOnxGRpKc3z/RG0R/gzUwIFg2zKk8UkVchM=
k8s.io/component-base v0.0.0-20240306172020-b0a6e40497ae/go.mod h1:xHRknJm8Q13BCZjYtVCjnJJEzKC9RMj6OqPgtPWU8yI=
k8s.io/component-base v0.0.0-20240312000449-3c774a67a455 h1:j5fjafwm40Ic4FCzHeQYFRtm6BkRZermvXfr3CpPvD0=
k8s.io/component-base v0.0.0-20240312000449-3c774a67a455/go.mod h1:MAhTa66phLV2a0us+GQWKR6GcD9PZlzuPnoGoWrCj+A=
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kms v0.0.0-20240306172340-03c9a46c21c7 h1:v9feiZ9mQnGuvoKR8FkDM/2yuptz78hIiFIGJrhY5oA=

11
pkg/endpoints/handlers/responsewriters/writers_test.go
View File

@ -53,8 +53,6 @@ func TestSerializeObjectParallel(t *testing.T) {
type test struct {
name string
compressionEnabled bool
mediaType string
out []byte
outErrs []error
@ -67,10 +65,9 @@ func TestSerializeObjectParallel(t *testing.T) {
}
newTest := func() test {
return test{
name: "compress on gzip",
compressionEnabled: true,
out: largePayload,
mediaType: "application/json",
name: "compress on gzip",
out: largePayload,
mediaType: "application/json",
req: &http.Request{
Header: http.Header{
"Accept-Encoding": []string{"gzip"},
@ -85,6 +82,7 @@ func TestSerializeObjectParallel(t *testing.T) {
},
}
}
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIResponseCompression, true)()
for i := 0; i < 100; i++ {
ctt := newTest()
t.Run(ctt.name, func(t *testing.T) {
@ -94,7 +92,6 @@ func TestSerializeObjectParallel(t *testing.T) {
}
}()
t.Parallel()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIResponseCompression, ctt.compressionEnabled)()
encoder := &fakeEncoder{
buf: ctt.out,

2
pkg/storage/cacher/cacher_test.go
View File

@ -173,6 +173,8 @@ func TestList(t *testing.T) {
}
func TestListWithListFromCache(t *testing.T) {
// TODO(https://github.com/etcd-io/etcd/issues/17507): Remove skip.
t.Skip("This test flakes flakes due to https://github.com/etcd-io/etcd/issues/17507")
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ConsistentListFromCache, true)()
ctx, cacher, server, terminate := testSetupWithEtcdServer(t)
t.Cleanup(terminate)