From 6025c228e6b3a690c8747a26b837c3c0c082fbdc Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Wed, 1 Feb 2017 13:53:43 +0100
Subject: [PATCH] pkg/storage/etcd: cut off pkg/api scheme

---
 pkg/server/options/etcd.go           | 4 +++-
 pkg/storage/storagebackend/config.go | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/server/options/etcd.go b/pkg/server/options/etcd.go
index 4cbdbece0..ae885eeda 100644
--- a/pkg/server/options/etcd.go
+++ b/pkg/server/options/etcd.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/spf13/pflag"
 
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
 )
 
@@ -34,13 +35,14 @@ type EtcdOptions struct {
 	EtcdServersOverrides []string
 }
 
-func NewEtcdOptions() *EtcdOptions {
+func NewEtcdOptions(scheme *runtime.Scheme) *EtcdOptions {
 	return &EtcdOptions{
 		StorageConfig: storagebackend.Config{
 			Prefix: DefaultEtcdPathPrefix,
 			// Default cache size to 0 - if unset, its size will be set based on target
 			// memory usage.
 			DeserializationCacheSize: 0,
+			Copier: scheme,
 		},
 	}
 }
diff --git a/pkg/storage/storagebackend/config.go b/pkg/storage/storagebackend/config.go
index 470a99e87..e1cdd8244 100644
--- a/pkg/storage/storagebackend/config.go
+++ b/pkg/storage/storagebackend/config.go
@@ -44,4 +44,5 @@ type Config struct {
 	DeserializationCacheSize int
 
 	Codec runtime.Codec
+	Copier runtime.ObjectCopier
 }