github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15371 from timothysc/etcd-contexts

Browse Source 
New etcd client modifications part 1 (context support)
This commit is contained in:
Dawn Chen
2015-10-12 16:04:13 -07:00
parent de22206929 2a2a2d79ff
commit 0901e5050d
13 changed files with 182 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/master/master.go
View File

@@ -87,6 +87,7 @@ import (
"github.com/emicklei/go-restful/swagger"
"github.com/golang/glog"
"github.com/prometheus/client_golang/prometheus"
"golang.org/x/net/context"
"k8s.io/kubernetes/pkg/registry/service/allocator"
"k8s.io/kubernetes/pkg/registry/service/portallocator"
)
@@ -149,13 +150,13 @@ func (s *StorageDestinations) backends() []string {
backends := sets.String{}
for _, group := range s.APIGroups {
if group.Default != nil {
for _, backend := range group.Default.Backends() {
for _, backend := range group.Default.Backends(context.TODO()) {
backends.Insert(backend)
}
}
if group.Overrides != nil {
for _, storage := range group.Overrides {
for _, backend := range storage.Backends() {
for _, backend := range storage.Backends(context.TODO()) {
backends.Insert(backend)
}
}