Skip to content

Commit c0cb748

Browse files
authored
Merge pull request #52 from andyxning/bump_kubernetes_to_v1.4.0-beta.3
bump kubernetes version to v1.4.0-beta.3
2 parents 3132378 + 2c12274 commit c0cb748

File tree

1,002 files changed

+416484
-130098
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,002 files changed

+416484
-130098
lines changed

Godeps/Godeps.json

Lines changed: 622 additions & 286 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/condition/manager.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
problemutil "k8s.io/node-problem-detector/pkg/util"
2727

2828
"k8s.io/kubernetes/pkg/api"
29-
"k8s.io/kubernetes/pkg/util"
29+
"k8s.io/kubernetes/pkg/util/clock"
3030

3131
"github.com/golang/glog"
3232
)
@@ -58,15 +58,15 @@ type ConditionManager interface {
5858

5959
type conditionManager struct {
6060
sync.Mutex
61-
clock util.Clock
61+
clock clock.Clock
6262
latest time.Time
6363
client problemclient.Client
6464
updates map[string]types.Condition
6565
conditions map[string]types.Condition
6666
}
6767

6868
// NewConditionManager creates a condition manager.
69-
func NewConditionManager(client problemclient.Client, clock util.Clock) ConditionManager {
69+
func NewConditionManager(client problemclient.Client, clock clock.Clock) ConditionManager {
7070
return &conditionManager{
7171
client: client,
7272
clock: clock,

pkg/condition/manager_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import (
2727
problemutil "k8s.io/node-problem-detector/pkg/util"
2828

2929
"k8s.io/kubernetes/pkg/api"
30-
"k8s.io/kubernetes/pkg/util"
30+
"k8s.io/kubernetes/pkg/util/clock"
3131
)
3232

33-
func newTestManager() (*conditionManager, *problemclient.FakeProblemClient, *util.FakeClock) {
33+
func newTestManager() (*conditionManager, *problemclient.FakeProblemClient, *clock.FakeClock) {
3434
fakeClient := problemclient.NewFakeProblemClient()
35-
fakeClock := util.NewFakeClock(time.Now())
35+
fakeClock := clock.NewFakeClock(time.Now())
3636
manager := NewConditionManager(fakeClient, fakeClock)
3737
return manager.(*conditionManager), fakeClient, fakeClock
3838
}

pkg/kernelmonitor/kernel_log_watcher.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ import (
2929
"k8s.io/node-problem-detector/pkg/kernelmonitor/types"
3030
"k8s.io/node-problem-detector/pkg/kernelmonitor/util"
3131

32+
utilclock "code.cloudfoundry.org/clock"
3233
"github.com/coreos/go-systemd/sdjournal"
3334
"github.com/golang/glog"
3435
"github.com/google/cadvisor/utils/tail"
35-
utilclock "github.com/pivotal-golang/clock"
3636
)
3737

3838
const (

pkg/kernelmonitor/kernel_log_watcher_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
"k8s.io/node-problem-detector/pkg/kernelmonitor/types"
2727

28-
"github.com/pivotal-golang/clock/fakeclock"
28+
"code.cloudfoundry.org/clock/fakeclock"
2929
)
3030

3131
func TestWatch(t *testing.T) {

pkg/problemclient/problem_client.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ import (
2121
"fmt"
2222
"os"
2323

24+
"k8s.io/kubernetes/pkg/util/clock"
25+
2426
"k8s.io/kubernetes/pkg/api"
2527
"k8s.io/kubernetes/pkg/api/unversioned"
2628
"k8s.io/kubernetes/pkg/client/record"
2729
"k8s.io/kubernetes/pkg/client/restclient"
2830
client "k8s.io/kubernetes/pkg/client/unversioned"
2931
"k8s.io/kubernetes/pkg/types"
30-
"k8s.io/kubernetes/pkg/util"
3132
)
3233

3334
// Client is the interface of problem client
@@ -43,14 +44,14 @@ type Client interface {
4344
type nodeProblemClient struct {
4445
nodeName string
4546
client *client.Client
46-
clock util.Clock
47+
clock clock.Clock
4748
recorders map[string]record.EventRecorder
4849
nodeRef *api.ObjectReference
4950
}
5051

5152
// NewClientOrDie creates a new problem client, panics if error occurs.
5253
func NewClientOrDie() Client {
53-
c := &nodeProblemClient{clock: util.RealClock{}}
54+
c := &nodeProblemClient{clock: clock.RealClock{}}
5455
cfg, err := restclient.InClusterConfig()
5556
if err != nil {
5657
panic(err)

pkg/problemclient/problem_client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"k8s.io/kubernetes/pkg/api"
2626
"k8s.io/kubernetes/pkg/api/unversioned"
2727
"k8s.io/kubernetes/pkg/client/record"
28-
"k8s.io/kubernetes/pkg/util"
28+
"k8s.io/kubernetes/pkg/util/clock"
2929

3030
"github.com/stretchr/testify/assert"
3131
)
@@ -40,7 +40,7 @@ func newFakeProblemClient() *nodeProblemClient {
4040
nodeName: testNode,
4141
// There is no proper fake for *client.Client for now
4242
// TODO(random-liu): Add test for SetConditions when we have good fake for *client.Client
43-
clock: &util.FakeClock{},
43+
clock: &clock.FakeClock{},
4444
recorders: make(map[string]record.EventRecorder),
4545
nodeRef: getNodeRef(testNode),
4646
}

pkg/problemdetector/problem_detector.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package problemdetector
1919
import (
2020
"github.com/golang/glog"
2121

22-
kubeutil "k8s.io/kubernetes/pkg/util"
22+
"k8s.io/kubernetes/pkg/util/clock"
2323

2424
"k8s.io/node-problem-detector/pkg/condition"
2525
"k8s.io/node-problem-detector/pkg/kernelmonitor"
@@ -45,7 +45,7 @@ func NewProblemDetector(monitor kernelmonitor.KernelMonitor) ProblemDetector {
4545
client := problemclient.NewClientOrDie()
4646
return &problemDetector{
4747
client: client,
48-
conditionManager: condition.NewConditionManager(client, kubeutil.RealClock{}),
48+
conditionManager: condition.NewConditionManager(client, clock.RealClock{}),
4949
monitor: monitor,
5050
}
5151
}

vendor/bitbucket.org/ww/goautoneg/Makefile

Lines changed: 0 additions & 13 deletions
This file was deleted.

vendor/bitbucket.org/ww/goautoneg/README.txt

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)