Merge pull request #10980 from smarterclayton/switch_proto

Merged by openshift-bot
openshift · Oct 24, 2016 · f1d0dd2 · f1d0dd2
2 parents d50865b + 306358a
commit f1d0dd2
Show file tree

Hide file tree

Showing 65 changed files with 1,675 additions and 1,205 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/pkg/cmd/server/start/master_args.go b/pkg/cmd/server/start/master_args.go
@@ -344,6 +344,16 @@ func (args MasterArgs) BuildSerializeableMasterConfig() (*configapi.MasterConfig
 	configapi.SetProtobufClientDefaults(config.MasterClients.OpenShiftLoopbackClientConnectionOverrides)
 	configapi.SetProtobufClientDefaults(config.MasterClients.ExternalKubernetesClientConnectionOverrides)
 
+	// Default storage backend to etcd3 with protobuf storage for our innate config when starting both
+	// Kubernetes and etcd.
+	if km := config.KubernetesMasterConfig; km != nil && config.EtcdConfig != nil {
+		if len(km.APIServerArguments) == 0 {
+			km.APIServerArguments = configapi.ExtendedArguments{}
+			km.APIServerArguments["storage-media-type"] = []string{"application/vnd.kubernetes.protobuf"}
+			km.APIServerArguments["storage-backend"] = []string{"etcd3"}
+		}
+	}
+
 	return config, nil
 }
 

diff --git a/vendor/github.com/coreos/etcd/auth/authpb/auth.pb.go b/vendor/github.com/coreos/etcd/auth/authpb/auth.pb.go
diff --git a/vendor/github.com/coreos/etcd/clientv3/balancer.go b/vendor/github.com/coreos/etcd/clientv3/balancer.go
diff --git a/vendor/github.com/coreos/etcd/clientv3/client.go b/vendor/github.com/coreos/etcd/clientv3/client.go
diff --git a/vendor/github.com/coreos/etcd/clientv3/config.go b/vendor/github.com/coreos/etcd/clientv3/config.go
diff --git a/vendor/github.com/coreos/etcd/clientv3/logger.go b/vendor/github.com/coreos/etcd/clientv3/logger.go