Merge pull request #41781 from wojtek-t/dont_use_base64_encoding_with-etcd3

Automatic merge from submit-queue (batch tested with PRs 41797, 41793, 41795, 41807, 41781) Don't use base64 encoding with etcd v3 In https://github.com/kubernetes/kubernetes/pull/36229 we changed the default storage to etcd v3. This in fact is a fix to that PR. With etcd v3, the base64-encoding is no longer needed - so we use it only if etcd v2 is explicitly requested as storage format. @lavalamp

Merge pull request #41781 from wojtek-t/dont_use_base64_encoding_with-etcd3
3e3133bc · Kubernetes Submit Queue · GitHub · 8fc311c9 · ce37b187 · 3e3133bc
Commit 3e3133bc authored Feb 22, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage_codec.go .../src/k8s.io/apiserver/pkg/server/storage/storage_codec.go +1 -1

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/server/storage/storage_codec.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/storage/storage_codec.go
@@ -56,7 +56,7 @@ func NewStorageCodec(opts StorageCodecConfig) (runtime.Codec, error) {

 	// etcd2 only supports string data - we must wrap any result before returning
 	// TODO: storagebackend should return a boolean indicating whether it supports binary data
-	if !serializer.EncodesAsText && (opts.Config.Type == storagebackend.StorageTypeUnset || opts.Config.Type == storagebackend.StorageTypeETCD2) {
+	if !serializer.EncodesAsText && opts.Config.Type == storagebackend.StorageTypeETCD2 {
 		glog.V(4).Infof("Wrapping the underlying binary storage serializer with a base64 encoding for etcd2")
 		s = runtime.NewBase64Serializer(s)
 	}