mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #40683 from wojtek-t/protobufs_by_default
Automatic merge from submit-queue (batch tested with PRs 40691, 40551, 40683, 40700, 40702) Enable protobufs as storage format by default **Release note**: ```release-note Change default storage format to protobufs. With this PR apiserver will be writing objects serialized as protobufs to etcd. If the apiserver was upgraded in the existing clusters, until an object will be written, it will still be stored as JSON. Apiserver can deal with some data being in json and some in protobuf format as of 1.4 release. ``` @kubernetes/sig-api-machinery-misc @kubernetes/sig-api-machinery-pr-reviews
This commit is contained in:
commit
fe992b7902
@ -87,6 +87,8 @@ func NewServerRunOptions() *ServerRunOptions {
|
||||
},
|
||||
ServiceNodePortRange: DefaultServiceNodePortRange,
|
||||
}
|
||||
// Overwrite the default for storage data format.
|
||||
s.GenericServerRunOptions.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf"
|
||||
return &s
|
||||
}
|
||||
|
||||
|
@ -55,6 +55,8 @@ func NewServerRunOptions() *ServerRunOptions {
|
||||
|
||||
EventTTL: 1 * time.Hour,
|
||||
}
|
||||
// Overwrite the default for storage data format.
|
||||
s.GenericServerRunOptions.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf"
|
||||
return &s
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,9 @@ type ServerRunOptions struct {
|
||||
AdmissionControlConfigFile string
|
||||
AdvertiseAddress net.IP
|
||||
|
||||
CorsAllowedOriginList []string
|
||||
CorsAllowedOriginList []string
|
||||
// To enable protobuf as storage format, it is enough
|
||||
// to set it to "application/vnd.kubernetes.protobuf".
|
||||
DefaultStorageMediaType string
|
||||
DeleteCollectionWorkers int
|
||||
AuditLogPath string
|
||||
|
Loading…
Reference in New Issue
Block a user