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

Merge pull request #40683 from wojtek-t/protobufs_by_default
fe992b79 · Kubernetes Submit Queue · GitHub · 25de8ef6 · dae29625 · fe992b79
Commit fe992b79 authored Jan 30, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 30, 2017
3 changed files
--- 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
 }

--- 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
 }

--- a/pkg/genericapiserver/server/options/server_run_options.go
+++ b/pkg/genericapiserver/server/options/server_run_options.go
@@ -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