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

Regenerating everything

Browse Source
This commit is contained in:
Kris
2015-09-10 10:23:51 -07:00
committed by Chao Xu
parent f4ad00d9ae
commit c5f22a025a
10 changed files with 585 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/controller/daemon/controller_test.go
View File

@@ -23,6 +23,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apis/experimental"
"k8s.io/kubernetes/pkg/client/cache"
client "k8s.io/kubernetes/pkg/client/unversioned"
@@ -81,7 +82,7 @@ func (f *FakePodControl) clear() {
func newDaemonSet(name string) *experimental.DaemonSet {
return &experimental.DaemonSet{
TypeMeta: api.TypeMeta{APIVersion: testapi.Experimental.Version()},
TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Experimental.Version()},
ObjectMeta: api.ObjectMeta{
Name: name,
Namespace: api.NamespaceDefault,
@@ -110,7 +111,7 @@ func newDaemonSet(name string) *experimental.DaemonSet {
func newNode(name string, label map[string]string) *api.Node {
return &api.Node{
TypeMeta: api.TypeMeta{APIVersion: testapi.Default.Version()},
TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()},
ObjectMeta: api.ObjectMeta{
Name: name,
Labels: label,
@@ -127,7 +128,7 @@ func addNodes(nodeStore cache.Store, startIndex, numNodes int, label map[string]
func newPod(podName string, nodeName string, label map[string]string) *api.Pod {
pod := &api.Pod{
TypeMeta: api.TypeMeta{APIVersion: testapi.Default.Version()},
TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()},
ObjectMeta: api.ObjectMeta{
GenerateName: podName,
Labels: label,