github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20783 from mesosphere/jdef_fix_scheduler_clientset_impl

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-08 05:42:16 -08:00
parent e4cb6a09b2 22d3cb9ea9
commit c78f3a68fd
3 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/mesos/pkg/executor/apis.go
View File

@@ -19,7 +19,7 @@ package executor
import (
"k8s.io/kubernetes/contrib/mesos/pkg/node"
"k8s.io/kubernetes/pkg/api"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
core_unversioned "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
)
type kubeAPI interface {
@@ -33,11 +33,11 @@ type nodeAPI interface {
// clientAPIWrapper implements kubeAPI and node API, which serve to isolate external dependencies
// such that they're easier to mock in unit test.
type clientAPIWrapper struct {
client *clientset.Clientset
client core_unversioned.CoreInterface
}
func (cw *clientAPIWrapper) killPod(ns, name string) error {
return cw.client.Core().Pods(ns).Delete(name, api.NewDeleteOptions(0))
return cw.client.Pods(ns).Delete(name, api.NewDeleteOptions(0))
}
func (cw *clientAPIWrapper) createOrUpdate(hostname string, slaveAttrLabels, annotations map[string]string) (*api.Node, error) {