github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13533 from brendandburns/fix

Browse Source 
Fix the build.
This commit is contained in:
Brendan Burns 2015-09-02 16:14:33 -07:00
commit aafbd26dfb
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/completions/bash/kubectl
View File

@ -845,6 +845,7 @@ _kubectl_label()
must_have_one_flag=() must_have_one_flag=()
must_have_one_noun=() must_have_one_noun=()
must_have_one_noun+=("componentstatus") must_have_one_noun+=("componentstatus")
must_have_one_noun+=("deployment")
must_have_one_noun+=("endpoints") must_have_one_noun+=("endpoints")
must_have_one_noun+=("event") must_have_one_noun+=("event")
must_have_one_noun+=("limitrange") must_have_one_noun+=("limitrange")

34
pkg/registry/thirdpartyresourcedata/etcd/etcd_test.go
View File

@ -26,6 +26,7 @@ import (
"k8s.io/kubernetes/pkg/expapi/v1" "k8s.io/kubernetes/pkg/expapi/v1"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/registry/registrytest"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/storage"
etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
@ -63,7 +64,7 @@ func validNewThirdPartyResourceData(name string) *expapi.ThirdPartyResourceData
func TestCreate(t *testing.T) { func TestCreate(t *testing.T) {
storage, fakeEtcdClient, _ := newStorage(t) storage, fakeEtcdClient, _ := newStorage(t)
test := resttest.New(t, storage, fakeEtcdClient.SetError) test := registrytest.New(t, fakeEtcdClient, storage.Etcd)
rsrc := validNewThirdPartyResourceData("foo") rsrc := validNewThirdPartyResourceData("foo")
rsrc.ObjectMeta = api.ObjectMeta{} rsrc.ObjectMeta = api.ObjectMeta{}
test.TestCreate( test.TestCreate(
@ -75,28 +76,17 @@ func TestCreate(t *testing.T) {
} }
func TestUpdate(t *testing.T) { func TestUpdate(t *testing.T) {
storage, fakeEtcdClient, _ := newStorage(t) storage, fakeClient, _ := newStorage(t)
test := resttest.New(t, storage, fakeEtcdClient.SetError) test := registrytest.New(t, fakeClient, storage.Etcd)
key, err := storage.KeyFunc(test.TestContext(), "foo")
if err != nil {
t.Fatal(err)
}
key = etcdtest.AddPrefix(key)
fakeEtcdClient.ExpectNotFoundGet(key)
fakeEtcdClient.ChangeIndex = 2
rsrc := validNewThirdPartyResourceData("foo")
existing := validNewThirdPartyResourceData("exists")
existing.Namespace = test.TestNamespace()
obj, err := storage.Create(test.TestContext(), existing)
if err != nil {
t.Fatalf("unable to create object: %v", err)
}
older := obj.(*expapi.ThirdPartyResourceData)
older.ResourceVersion = "1"
test.TestUpdate( test.TestUpdate(
rsrc, // valid
existing, validNewThirdPartyResourceData("foo"),
older, // updateFunc
func(obj runtime.Object) runtime.Object {
object := obj.(*expapi.ThirdPartyResourceData)
object.Data = []byte("new description")
return object
},
) )
} }