From ce37b1872861f621797004d294b77f77a09fe27c Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Tue, 21 Feb 2017 10:31:34 +0100 Subject: [PATCH] Don't use base64 encoding with etcd v3 --- .../src/k8s.io/apiserver/pkg/server/storage/storage_codec.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/storage/storage_codec.go b/staging/src/k8s.io/apiserver/pkg/server/storage/storage_codec.go index c815851d343..b6f8cf713ba 100644 --- 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) }