Skip to content

Commit

Permalink
nil etcd options
Browse files Browse the repository at this point in the history
nil etcd options
  • Loading branch information
yue9944882 committed Apr 14, 2021
1 parent 32d3dbb commit b05d57b
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion internal/sample-apiserver/pkg/cmd/server/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ func (o *WardleServerOptions) Config() (*apiserver.Config, error) {
return nil, fmt.Errorf("error creating self-signed certificates: %v", err)
}

o.RecommendedOptions.Etcd.StorageConfig.Paging = utilfeature.DefaultFeatureGate.Enabled(features.APIListChunking)
// change: allow etcd options to be nil
// TODO: this should be reverted after rebasing sample-apiserver onto https://github.com/kubernetes/kubernetes/pull/101106
if o.RecommendedOptions.Etcd != nil {
o.RecommendedOptions.Etcd.StorageConfig.Paging = utilfeature.DefaultFeatureGate.Enabled(features.APIListChunking)
}

// change: apiserver-runtime
// ExtraAdmissionInitializers set through ApplyServerOptionsFns by appending to ServerOptionsFns
Expand Down

0 comments on commit b05d57b

Please sign in to comment.