scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 03:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace client with clientset in kubelet and other places

Browse Source
This commit is contained in:
Chao Xu
2016-02-01 14:30:47 -08:00
parent fe7887f1ec
commit cddd7b56a4
65 changed files with 643 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/mesos/pkg/node/node.go
View File

@@ -23,12 +23,13 @@ import (
"strings"
"time"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1"
log "github.com/golang/glog"
mesos "github.com/mesos/mesos-go/mesosproto"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/unversioned"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/util/validation"
)
@@ -41,7 +42,7 @@ const (
// Create creates a new node api object with the given hostname,
// slave attribute labels and annotations
func Create(
client *client.Client,
client *clientset.Clientset,
hostName string,
slaveAttrLabels,
annotations map[string]string,
@@ -87,7 +88,7 @@ func Create(
// The updated node merges the given slave attribute labels
// and annotations with the found api object.
func Update(
client *client.Client,
client *clientset.Clientset,
hostname string,
slaveAttrLabels,
annotations map[string]string,
@@ -122,7 +123,7 @@ func Update(
// CreateOrUpdate creates a node api object or updates an existing one
func CreateOrUpdate(
client *client.Client,
client *clientset.Clientset,
hostname string,
slaveAttrLabels,
annotations map[string]string,