bump kubernetes version to v1.4.0-beta.3

This commit is contained in:
andy xie
2016-12-20 18:11:03 +08:00
parent 31323787ec
commit 2c12274333
1002 changed files with 422657 additions and 136271 deletions
+4 -3
View File
@@ -21,13 +21,14 @@ import (
"fmt"
"os"
"k8s.io/kubernetes/pkg/util/clock"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/client/restclient"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util"
)
// Client is the interface of problem client
@@ -43,14 +44,14 @@ type Client interface {
type nodeProblemClient struct {
nodeName string
client *client.Client
clock util.Clock
clock clock.Clock
recorders map[string]record.EventRecorder
nodeRef *api.ObjectReference
}
// NewClientOrDie creates a new problem client, panics if error occurs.
func NewClientOrDie() Client {
c := &nodeProblemClient{clock: util.RealClock{}}
c := &nodeProblemClient{clock: clock.RealClock{}}
cfg, err := restclient.InClusterConfig()
if err != nil {
panic(err)
+2 -2
View File
@@ -25,7 +25,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/clock"
"github.com/stretchr/testify/assert"
)
@@ -40,7 +40,7 @@ func newFakeProblemClient() *nodeProblemClient {
nodeName: testNode,
// There is no proper fake for *client.Client for now
// TODO(random-liu): Add test for SetConditions when we have good fake for *client.Client
clock: &util.FakeClock{},
clock: &clock.FakeClock{},
recorders: make(map[string]record.EventRecorder),
nodeRef: getNodeRef(testNode),
}