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

Del capatical local packagename for controllerFramework

Browse Source
This commit is contained in:
mqliang
2015-10-16 16:01:58 +08:00
parent b8aabbbf4f
commit df5afa874a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/density.go
View File

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