github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15764 from mqliang/importAlias

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-20 17:14:29 -07:00
commit 280c38daae
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/daemon_restart.go
View File

@ -24,7 +24,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
controllerFramework "k8s.io/kubernetes/pkg/controller/framework" controllerframework "k8s.io/kubernetes/pkg/controller/framework"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/master/ports"
@ -191,7 +191,7 @@ var _ = Describe("DaemonRestart", func() {
existingPods := cache.NewStore(cache.MetaNamespaceKeyFunc) existingPods := cache.NewStore(cache.MetaNamespaceKeyFunc)
var ns string var ns string
var config RCConfig var config RCConfig
var controller *controllerFramework.Controller var controller *controllerframework.Controller
var newPods cache.Store var newPods cache.Store
var stopCh chan struct{} var stopCh chan struct{}
var tracker *podTracker var tracker *podTracker
@ -219,7 +219,7 @@ var _ = Describe("DaemonRestart", func() {
stopCh = make(chan struct{}) stopCh = make(chan struct{})
tracker = newPodTracker() tracker = newPodTracker()
newPods, controller = controllerFramework.NewInformer( newPods, controller = controllerframework.NewInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func() (runtime.Object, error) { ListFunc: func() (runtime.Object, error) {
return framework.Client.Pods(ns).List(labelSelector, fields.Everything()) return framework.Client.Pods(ns).List(labelSelector, fields.Everything())
@ -230,7 +230,7 @@ var _ = Describe("DaemonRestart", func() {
}, },
&api.Pod{}, &api.Pod{},
0, 0,
controllerFramework.ResourceEventHandlerFuncs{ controllerframework.ResourceEventHandlerFuncs{
AddFunc: func(obj interface{}) { AddFunc: func(obj interface{}) {
tracker.remember(obj.(*api.Pod), ADD) tracker.remember(obj.(*api.Pod), ADD)
}, },

10
test/e2e/density.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
controllerFramework "k8s.io/kubernetes/pkg/controller/framework" controllerframework "k8s.io/kubernetes/pkg/controller/framework"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
@ -197,7 +197,7 @@ var _ = Describe("Density", func() {
// Create a listener for events. // Create a listener for events.
events := make([](*api.Event), 0) events := make([](*api.Event), 0)
_, controller := controllerFramework.NewInformer( _, controller := controllerframework.NewInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func() (runtime.Object, error) { ListFunc: func() (runtime.Object, error) {
return c.Events(ns).List(labels.Everything(), fields.Everything()) return c.Events(ns).List(labels.Everything(), fields.Everything())
@ -208,7 +208,7 @@ var _ = Describe("Density", func() {
}, },
&api.Event{}, &api.Event{},
0, 0,
controllerFramework.ResourceEventHandlerFuncs{ controllerframework.ResourceEventHandlerFuncs{
AddFunc: func(obj interface{}) { AddFunc: func(obj interface{}) {
events = append(events, obj.(*api.Event)) events = append(events, obj.(*api.Event))
}, },
@ -280,7 +280,7 @@ var _ = Describe("Density", func() {
} }
additionalPodsPrefix = "density-latency-pod-" + string(util.NewUUID()) additionalPodsPrefix = "density-latency-pod-" + string(util.NewUUID())
_, controller := controllerFramework.NewInformer( _, controller := controllerframework.NewInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func() (runtime.Object, error) { ListFunc: func() (runtime.Object, error) {
return c.Pods(ns).List(labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}), fields.Everything()) return c.Pods(ns).List(labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}), fields.Everything())
@ -291,7 +291,7 @@ var _ = Describe("Density", func() {
}, },
&api.Pod{}, &api.Pod{},
0, 0,
controllerFramework.ResourceEventHandlerFuncs{ controllerframework.ResourceEventHandlerFuncs{
AddFunc: func(obj interface{}) { AddFunc: func(obj interface{}) {
p, ok := obj.(*api.Pod) p, ok := obj.(*api.Pod)
Expect(ok).To(Equal(true)) Expect(ok).To(Equal(true))