Remove storageConfig.Paging parameter

This commit is contained in:
Wojciech Tyczyński 2023-10-20 15:35:58 +02:00
parent 106f58686d
commit b386120da2
11 changed files with 7 additions and 23 deletions

View File

@ -92,7 +92,6 @@ func createAggregatorConfig(
// we assume that the etcd options have been completed already. avoid messing with anything outside // we assume that the etcd options have been completed already. avoid messing with anything outside
// of changes to StorageConfig as that may lead to unexpected behavior when the options are applied. // of changes to StorageConfig as that may lead to unexpected behavior when the options are applied.
etcdOptions := *commandOptions.Etcd etcdOptions := *commandOptions.Etcd
etcdOptions.StorageConfig.Paging = true
etcdOptions.StorageConfig.Codec = aggregatorscheme.Codecs.LegacyCodec(v1.SchemeGroupVersion, v1beta1.SchemeGroupVersion) etcdOptions.StorageConfig.Codec = aggregatorscheme.Codecs.LegacyCodec(v1.SchemeGroupVersion, v1beta1.SchemeGroupVersion)
etcdOptions.StorageConfig.EncodeVersioner = runtime.NewMultiGroupVersioner(v1.SchemeGroupVersion, schema.GroupKind{Group: v1beta1.GroupName}) etcdOptions.StorageConfig.EncodeVersioner = runtime.NewMultiGroupVersioner(v1.SchemeGroupVersion, schema.GroupKind{Group: v1beta1.GroupName})
etcdOptions.SkipHealthEndpoints = true // avoid double wiring of health checks etcdOptions.SkipHealthEndpoints = true // avoid double wiring of health checks

View File

@ -157,7 +157,6 @@ func TestAddFlags(t *testing.T) {
CertFile: "/var/run/kubernetes/etcdce.crt", CertFile: "/var/run/kubernetes/etcdce.crt",
TracerProvider: oteltrace.NewNoopTracerProvider(), TracerProvider: oteltrace.NewNoopTracerProvider(),
}, },
Paging: true,
Prefix: "/registry", Prefix: "/registry",
CompactionInterval: storagebackend.DefaultCompactInterval, CompactionInterval: storagebackend.DefaultCompactInterval,
CountMetricPollPeriod: time.Minute, CountMetricPollPeriod: time.Minute,

View File

@ -50,7 +50,6 @@ func CreateAPIExtensionsConfig(
// we assume that the etcd options have been completed already. avoid messing with anything outside // we assume that the etcd options have been completed already. avoid messing with anything outside
// of changes to StorageConfig as that may lead to unexpected behavior when the options are applied. // of changes to StorageConfig as that may lead to unexpected behavior when the options are applied.
etcdOptions := *commandOptions.Etcd etcdOptions := *commandOptions.Etcd
etcdOptions.StorageConfig.Paging = true
// this is where the true decodable levels come from. // this is where the true decodable levels come from.
etcdOptions.StorageConfig.Codec = apiextensionsapiserver.Codecs.LegacyCodec(v1beta1.SchemeGroupVersion, v1.SchemeGroupVersion) etcdOptions.StorageConfig.Codec = apiextensionsapiserver.Codecs.LegacyCodec(v1beta1.SchemeGroupVersion, v1.SchemeGroupVersion)
// prefer the more compact serialization (v1beta1) for storage until https://issue.k8s.io/82292 is resolved for objects whose v1 serialization is too big but whose v1beta1 serialization can be stored // prefer the more compact serialization (v1beta1) for storage until https://issue.k8s.io/82292 is resolved for objects whose v1 serialization is too big but whose v1beta1 serialization can be stored

View File

@ -143,7 +143,6 @@ func TestAddFlags(t *testing.T) {
CertFile: "/var/run/kubernetes/etcdce.crt", CertFile: "/var/run/kubernetes/etcdce.crt",
TracerProvider: oteltrace.NewNoopTracerProvider(), TracerProvider: oteltrace.NewNoopTracerProvider(),
}, },
Paging: true,
Prefix: "/registry", Prefix: "/registry",
CompactionInterval: storagebackend.DefaultCompactInterval, CompactionInterval: storagebackend.DefaultCompactInterval,
CountMetricPollPeriod: time.Minute, CountMetricPollPeriod: time.Minute,

View File

@ -44,8 +44,6 @@ import (
) )
type EtcdOptions struct { type EtcdOptions struct {
// The value of Paging on StorageConfig will be overridden by the
// calculated feature gate value.
StorageConfig storagebackend.Config StorageConfig storagebackend.Config
EncryptionProviderConfigFilepath string EncryptionProviderConfigFilepath string
EncryptionProviderConfigAutomaticReload bool EncryptionProviderConfigAutomaticReload bool

View File

@ -149,7 +149,6 @@ func NewDefaultStorageFactory(
resourceConfig APIResourceConfigSource, resourceConfig APIResourceConfigSource,
specialDefaultResourcePrefixes map[schema.GroupResource]string, specialDefaultResourcePrefixes map[schema.GroupResource]string,
) *DefaultStorageFactory { ) *DefaultStorageFactory {
config.Paging = true
if len(defaultMediaType) == 0 { if len(defaultMediaType) == 0 {
defaultMediaType = runtime.ContentTypeJSON defaultMediaType = runtime.ContentTypeJSON
} }

View File

@ -197,30 +197,30 @@ func TestConfigs(t *testing.T) {
}{ }{
{ {
wantConfigs: []storagebackend.Config{ wantConfigs: []storagebackend.Config{
{Transport: storagebackend.TransportConfig{ServerList: defaultEtcdLocations}, Prefix: "/registry", Paging: true}, {Transport: storagebackend.TransportConfig{ServerList: defaultEtcdLocations}, Prefix: "/registry"},
}, },
}, },
{ {
resource: &schema.GroupResource{Group: example.GroupName, Resource: "resource"}, resource: &schema.GroupResource{Group: example.GroupName, Resource: "resource"},
servers: []string{}, servers: []string{},
wantConfigs: []storagebackend.Config{ wantConfigs: []storagebackend.Config{
{Transport: storagebackend.TransportConfig{ServerList: defaultEtcdLocations}, Prefix: "/registry", Paging: true}, {Transport: storagebackend.TransportConfig{ServerList: defaultEtcdLocations}, Prefix: "/registry"},
}, },
}, },
{ {
resource: &schema.GroupResource{Group: example.GroupName, Resource: "resource"}, resource: &schema.GroupResource{Group: example.GroupName, Resource: "resource"},
servers: []string{"http://127.0.0.1:10000"}, servers: []string{"http://127.0.0.1:10000"},
wantConfigs: []storagebackend.Config{ wantConfigs: []storagebackend.Config{
{Transport: storagebackend.TransportConfig{ServerList: defaultEtcdLocations}, Prefix: "/registry", Paging: true}, {Transport: storagebackend.TransportConfig{ServerList: defaultEtcdLocations}, Prefix: "/registry"},
{Transport: storagebackend.TransportConfig{ServerList: []string{"http://127.0.0.1:10000"}}, Prefix: "/registry", Paging: true}, {Transport: storagebackend.TransportConfig{ServerList: []string{"http://127.0.0.1:10000"}}, Prefix: "/registry"},
}, },
}, },
{ {
resource: &schema.GroupResource{Group: example.GroupName, Resource: "resource"}, resource: &schema.GroupResource{Group: example.GroupName, Resource: "resource"},
servers: []string{"http://127.0.0.1:10000", "https://127.0.0.1", "http://127.0.0.2"}, servers: []string{"http://127.0.0.1:10000", "https://127.0.0.1", "http://127.0.0.2"},
wantConfigs: []storagebackend.Config{ wantConfigs: []storagebackend.Config{
{Transport: storagebackend.TransportConfig{ServerList: defaultEtcdLocations}, Prefix: "/registry", Paging: true}, {Transport: storagebackend.TransportConfig{ServerList: defaultEtcdLocations}, Prefix: "/registry"},
{Transport: storagebackend.TransportConfig{ServerList: []string{"http://127.0.0.1:10000", "https://127.0.0.1", "http://127.0.0.2"}}, Prefix: "/registry", Paging: true}, {Transport: storagebackend.TransportConfig{ServerList: []string{"http://127.0.0.1:10000", "https://127.0.0.1", "http://127.0.0.2"}}, Prefix: "/registry"},
}, },
}, },
} }

View File

@ -44,7 +44,6 @@ func NewUnsecuredEtcd3TestClientServer(t *testing.T) (*EtcdTestServer, *storageb
Transport: storagebackend.TransportConfig{ Transport: storagebackend.TransportConfig{
ServerList: server.V3Client.Endpoints(), ServerList: server.V3Client.Endpoints(),
}, },
Paging: true,
} }
return server, config return server, config
} }

View File

@ -62,11 +62,6 @@ type Config struct {
Prefix string Prefix string
// Transport holds all connection related info, i.e. equal TransportConfig means equal servers we talk to. // Transport holds all connection related info, i.e. equal TransportConfig means equal servers we talk to.
Transport TransportConfig Transport TransportConfig
// Paging indicates whether the server implementation should allow paging (if it is
// supported). This is generally configured by feature gating, or by a specific
// resource type not wishing to allow paging, and is not intended for end users to
// set.
Paging bool
Codec runtime.Codec Codec runtime.Codec
// EncodeVersioner is the same groupVersioner used to build the // EncodeVersioner is the same groupVersioner used to build the
@ -115,7 +110,6 @@ func (config *Config) ForResource(resource schema.GroupResource) *ConfigForResou
func NewDefaultConfig(prefix string, codec runtime.Codec) *Config { func NewDefaultConfig(prefix string, codec runtime.Codec) *Config {
return &Config{ return &Config{
Paging: true,
Prefix: prefix, Prefix: prefix,
Codec: codec, Codec: codec,
CompactionInterval: DefaultCompactInterval, CompactionInterval: DefaultCompactInterval,

View File

@ -454,7 +454,7 @@ func newETCD3Storage(c storagebackend.ConfigForResource, newFunc, newListFunc fu
if transformer == nil { if transformer == nil {
transformer = identity.NewEncryptCheckTransformer() transformer = identity.NewEncryptCheckTransformer()
} }
return etcd3.New(client, c.Codec, newFunc, newListFunc, c.Prefix, resourcePrefix, c.GroupResource, transformer, c.Paging, c.LeaseManagerConfig), destroyFunc, nil return etcd3.New(client, c.Codec, newFunc, newListFunc, c.Prefix, resourcePrefix, c.GroupResource, transformer, true, c.LeaseManagerConfig), destroyFunc, nil
} }
// startDBSizeMonitorPerEndpoint starts a loop to monitor etcd database size and update the // startDBSizeMonitorPerEndpoint starts a loop to monitor etcd database size and update the

View File

@ -123,8 +123,6 @@ func (o *WardleServerOptions) Config() (*apiserver.Config, error) {
return nil, fmt.Errorf("error creating self-signed certificates: %v", err) return nil, fmt.Errorf("error creating self-signed certificates: %v", err)
} }
o.RecommendedOptions.Etcd.StorageConfig.Paging = true
o.RecommendedOptions.ExtraAdmissionInitializers = func(c *genericapiserver.RecommendedConfig) ([]admission.PluginInitializer, error) { o.RecommendedOptions.ExtraAdmissionInitializers = func(c *genericapiserver.RecommendedConfig) ([]admission.PluginInitializer, error) {
client, err := clientset.NewForConfig(c.LoopbackClientConfig) client, err := clientset.NewForConfig(c.LoopbackClientConfig)
if err != nil { if err != nil {