Skip to content

Commit 005eb53

Browse files
authored
Merge pull request kubernetes#77278 from liggitt/enable-etcd-paging
Enable API resource paging by default, by feature gate in sample-apiserver
2 parents 6a23a62 + 90cd672 commit 005eb53

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

cmd/kube-apiserver/app/options/options_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ func TestAddFlags(t *testing.T) {
150150
CAFile: "/var/run/kubernetes/etcdca.crt",
151151
CertFile: "/var/run/kubernetes/etcdce.crt",
152152
},
153+
Paging: true,
153154
Prefix: "/registry",
154155
CompactionInterval: storagebackend.DefaultCompactInterval,
155156
CountMetricPollPeriod: time.Minute,

staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ type Config struct {
7272

7373
func NewDefaultConfig(prefix string, codec runtime.Codec) *Config {
7474
return &Config{
75+
Paging: true,
7576
Prefix: prefix,
7677
Codec: codec,
7778
CompactionInterval: DefaultCompactInterval,

staging/src/k8s.io/sample-apiserver/pkg/cmd/server/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ go_library(
1515
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
1616
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
1717
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
18+
"//staging/src/k8s.io/apiserver/pkg/features:go_default_library",
1819
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
1920
"//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",
2021
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",

staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"k8s.io/apimachinery/pkg/runtime/schema"
2828
utilerrors "k8s.io/apimachinery/pkg/util/errors"
2929
"k8s.io/apiserver/pkg/admission"
30+
"k8s.io/apiserver/pkg/features"
3031
genericapiserver "k8s.io/apiserver/pkg/server"
3132
genericoptions "k8s.io/apiserver/pkg/server/options"
3233
utilfeature "k8s.io/apiserver/pkg/util/feature"
@@ -113,6 +114,8 @@ func (o *WardleServerOptions) Config() (*apiserver.Config, error) {
113114
return nil, fmt.Errorf("error creating self-signed certificates: %v", err)
114115
}
115116

117+
o.RecommendedOptions.Etcd.StorageConfig.Paging = utilfeature.DefaultFeatureGate.Enabled(features.APIListChunking)
118+
116119
o.RecommendedOptions.ExtraAdmissionInitializers = func(c *genericapiserver.RecommendedConfig) ([]admission.PluginInitializer, error) {
117120
client, err := clientset.NewForConfig(c.LoopbackClientConfig)
118121
if err != nil {

0 commit comments

Comments
 (0)