mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
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
This commit is contained in:
commit
3e3133bc59
@ -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)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user