From dae29625da5b6bce6547d6e2beba7101478dc3cd Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Mon, 30 Jan 2017 15:57:43 +0100 Subject: [PATCH] Enable protobufs in etcd by default --- cmd/kube-apiserver/app/options/options.go | 2 ++ federation/cmd/federation-apiserver/app/options/options.go | 2 ++ pkg/genericapiserver/server/options/server_run_options.go | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index 4f7dc8ec749..7955981dc23 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -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 } diff --git a/federation/cmd/federation-apiserver/app/options/options.go b/federation/cmd/federation-apiserver/app/options/options.go index 634f72675df..5413ceb6bc3 100644 --- a/federation/cmd/federation-apiserver/app/options/options.go +++ b/federation/cmd/federation-apiserver/app/options/options.go @@ -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 } diff --git a/pkg/genericapiserver/server/options/server_run_options.go b/pkg/genericapiserver/server/options/server_run_options.go index a0a338815b0..b9b0adf84da 100644 --- a/pkg/genericapiserver/server/options/server_run_options.go +++ b/pkg/genericapiserver/server/options/server_run_options.go @@ -37,7 +37,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