upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-09 00:34:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #139041 from Jefftree/cacher-tests-default-proto-codec

Browse source 
cacher: switch test codec default from JSON to protobuf
This commit is contained in:
Kubernetes Prow Robot 2026-05-14 05:30:27 +05:30 committed by GitHub
commit 6ad1a1b81b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_test.go
View file

@ -381,7 +381,7 @@ func TestStats(t *testing.T) {
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SizeBasedListCostEstimate, sizeBasedListCostEstimate)
ctx, cacher, terminate := testSetup(t)
t.Cleanup(terminate)
storagetesting.RunTestStats(ctx, t, cacher, codecs.LegacyCodec(examplev1.SchemeGroupVersion), identity.NewEncryptCheckTransformer(), sizeBasedListCostEstimate)
storagetesting.RunTestStats(ctx, t, cacher, examplev1ProtoCodec, identity.NewEncryptCheckTransformer(), sizeBasedListCostEstimate)
})
}
}
@ -492,6 +492,7 @@ type setupOptions struct {
indexerFuncs map[string]storage.IndexerFunc
indexers cache.Indexers
clock clock.WithTicker
codec runtime.Codec
}
type setupOption func(*setupOptions)
@ -502,6 +503,7 @@ func withDefaults(options *setupOptions) {
options.resourcePrefix = prefix
options.keyFunc = func(obj runtime.Object) (string, error) { return storage.NamespaceKeyFunc(prefix, obj) }
options.clock = clock.RealClock{}
options.codec = examplev1ProtoCodec
}
func withClusterScopedKeyFunc(options *setupOptions) {
@ -545,7 +547,7 @@ func testSetupWithEtcdServer(t testing.TB, opts ...setupOption) (context.Context
opt(&setupOpts)
}
server, etcdStorage := newEtcdTestStorage(t, etcd3testing.PathPrefix())
server, etcdStorage := newEtcdTestStorageWithCodec(t, etcd3testing.PathPrefix(), setupOpts.codec)
// Inject one list error to make sure we test the relist case.
listErrors := 1
if clientfeatures.FeatureGates().Enabled(clientfeatures.WatchListClient) {
@ -570,7 +572,7 @@ func testSetupWithEtcdServer(t testing.TB, opts ...setupOption) (context.Context
NewListFunc: newPodList,
IndexerFuncs: setupOpts.indexerFuncs,
Indexers: &setupOpts.indexers,
Codec: codecs.LegacyCodec(examplev1.SchemeGroupVersion),
Codec: setupOpts.codec,
Clock: setupOpts.clock,
}
cacher, err := NewCacherFromConfig(config)

12
staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_testing_utils_test.go
View file

@ -25,7 +25,6 @@ import (
clientv3 "go.etcd.io/etcd/client/v3"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/apitesting"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels"
@ -62,17 +61,24 @@ func init() {
scheme.AddUnversionedTypes(corev1.SchemeGroupVersion, &metav1.Status{})
pb := protobuf.NewSerializer(scheme, scheme)
corev1ProtoCodec = codecs.CodecForVersions(pb, pb, schema.GroupVersions{corev1.SchemeGroupVersion}, nil)
examplev1ProtoCodec = codecs.CodecForVersions(pb, pb, schema.GroupVersions{examplev1.SchemeGroupVersion}, nil)
}
var corev1ProtoCodec runtime.Codec
var (
corev1ProtoCodec runtime.Codec
examplev1ProtoCodec runtime.Codec
)
func newPod() runtime.Object { return &example.Pod{} }
func newPodList() runtime.Object { return &example.PodList{} }
func newEtcdTestStorage(t testing.TB, prefix string) (*etcd3testing.EtcdTestServer, storage.Interface) {
return newEtcdTestStorageWithCodec(t, prefix, examplev1ProtoCodec)
}
func newEtcdTestStorageWithCodec(t testing.TB, prefix string, codec runtime.Codec) (*etcd3testing.EtcdTestServer, storage.Interface) {
server, _ := etcd3testing.NewUnsecuredEtcd3TestClientServer(t)
versioner := storage.APIObjectVersioner{}
codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)
compactor := etcd3.NewCompactor(server.V3Client.Client, 0, clock.RealClock{}, nil)
t.Cleanup(compactor.Stop)
storage, err := etcd3.New(