github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

replace framework.RunAMaster with kubeapiservertesting.StartTestServer

Browse Source
This commit is contained in:
xuzhonghu 2018-07-28 10:33:39 +08:00
parent b4a73d50c0
commit b7f645a5ef
3 changed files with 76 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/client/BUILD
View File

@ -15,6 +15,7 @@ go_test(
], ],
tags = ["integration"], tags = ["integration"],
deps = [ deps = [
"//cmd/kube-apiserver/app/testing:go_default_library",
"//pkg/api/legacyscheme:go_default_library", "//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testapi:go_default_library", "//pkg/api/testapi:go_default_library",
"//pkg/version:go_default_library", "//pkg/version:go_default_library",
@ -31,7 +32,6 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
"//staging/src/k8s.io/client-go/dynamic:go_default_library", "//staging/src/k8s.io/client-go/dynamic:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/client-go/rest:go_default_library",
"//test/integration/framework:go_default_library", "//test/integration/framework:go_default_library",
"//test/utils/image:go_default_library", "//test/utils/image:go_default_library",
], ],

135
test/integration/client/client_test.go
View File

@ -36,7 +36,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/version"
"k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/framework"
@ -44,13 +44,10 @@ import (
) )
func TestClient(t *testing.T) { func TestClient(t *testing.T) {
_, s, closeFn := framework.RunAMaster(nil) result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd())
defer closeFn() defer result.TearDownFn()
client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) client := clientset.NewForConfigOrDie(result.ClientConfig)
ns := framework.CreateTestingNamespace("client", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
info, err := client.Discovery().ServerVersion() info, err := client.Discovery().ServerVersion()
if err != nil { if err != nil {
@ -60,7 +57,7 @@ func TestClient(t *testing.T) {
t.Errorf("expected %#v, got %#v", e, a) t.Errorf("expected %#v, got %#v", e, a)
} }
pods, err := client.Core().Pods(ns.Name).List(metav1.ListOptions{}) pods, err := client.CoreV1().Pods("default").List(metav1.ListOptions{})
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
@ -72,7 +69,7 @@ func TestClient(t *testing.T) {
pod := &v1.Pod{ pod := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
GenerateName: "test", GenerateName: "test",
Namespace: ns.Name, Namespace: "default",
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{
@ -83,14 +80,14 @@ func TestClient(t *testing.T) {
}, },
} }
got, err := client.Core().Pods(ns.Name).Create(pod) got, err := client.CoreV1().Pods("default").Create(pod)
if err == nil { if err == nil {
t.Fatalf("unexpected non-error: %v", got) t.Fatalf("unexpected non-error: %v", got)
} }
// get a created pod // get a created pod
pod.Spec.Containers[0].Image = "an-image" pod.Spec.Containers[0].Image = "an-image"
got, err = client.Core().Pods(ns.Name).Create(pod) got, err = client.CoreV1().Pods("default").Create(pod)
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
@ -99,7 +96,7 @@ func TestClient(t *testing.T) {
} }
// pod is shown, but not scheduled // pod is shown, but not scheduled
pods, err = client.Core().Pods(ns.Name).List(metav1.ListOptions{}) pods, err = client.CoreV1().Pods("default").List(metav1.ListOptions{})
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
@ -116,21 +113,18 @@ func TestClient(t *testing.T) {
} }
func TestAtomicPut(t *testing.T) { func TestAtomicPut(t *testing.T) {
_, s, closeFn := framework.RunAMaster(nil) result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd())
defer closeFn() defer result.TearDownFn()
c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) c := clientset.NewForConfigOrDie(result.ClientConfig)
ns := framework.CreateTestingNamespace("atomic-put", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
rcBody := v1.ReplicationController{ rcBody := v1.ReplicationController{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
APIVersion: c.Core().RESTClient().APIVersion().String(), APIVersion: c.CoreV1().RESTClient().APIVersion().String(),
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "atomicrc", Name: "atomicrc",
Namespace: ns.Name, Namespace: "default",
Labels: map[string]string{ Labels: map[string]string{
"name": "atomicrc", "name": "atomicrc",
}, },
@ -154,7 +148,7 @@ func TestAtomicPut(t *testing.T) {
}, },
}, },
} }
rcs := c.Core().ReplicationControllers(ns.Name) rcs := c.CoreV1().ReplicationControllers("default")
rc, err := rcs.Create(&rcBody) rc, err := rcs.Create(&rcBody)
if err != nil { if err != nil {
t.Fatalf("Failed creating atomicRC: %v", err) t.Fatalf("Failed creating atomicRC: %v", err)
@ -208,23 +202,20 @@ func TestAtomicPut(t *testing.T) {
} }
func TestPatch(t *testing.T) { func TestPatch(t *testing.T) {
_, s, closeFn := framework.RunAMaster(nil) result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd())
defer closeFn() defer result.TearDownFn()
c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) c := clientset.NewForConfigOrDie(result.ClientConfig)
ns := framework.CreateTestingNamespace("patch", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
name := "patchpod" name := "patchpod"
resource := "pods" resource := "pods"
podBody := v1.Pod{ podBody := v1.Pod{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
APIVersion: c.Core().RESTClient().APIVersion().String(), APIVersion: c.CoreV1().RESTClient().APIVersion().String(),
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: name, Name: name,
Namespace: ns.Name, Namespace: "default",
Labels: map[string]string{}, Labels: map[string]string{},
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
@ -233,7 +224,7 @@ func TestPatch(t *testing.T) {
}, },
}, },
} }
pods := c.Core().Pods(ns.Name) pods := c.CoreV1().Pods("default")
pod, err := pods.Create(&podBody) pod, err := pods.Create(&podBody)
if err != nil { if err != nil {
t.Fatalf("Failed creating patchpods: %v", err) t.Fatalf("Failed creating patchpods: %v", err)
@ -263,12 +254,12 @@ func TestPatch(t *testing.T) {
}, },
} }
pb := patchBodies[c.Core().RESTClient().APIVersion()] pb := patchBodies[c.CoreV1().RESTClient().APIVersion()]
execPatch := func(pt types.PatchType, body []byte) error { execPatch := func(pt types.PatchType, body []byte) error {
result := c.Core().RESTClient().Patch(pt). result := c.CoreV1().RESTClient().Patch(pt).
Resource(resource). Resource(resource).
Namespace(ns.Name). Namespace("default").
Name(name). Name(name).
Body(body). Body(body).
Do() Do()
@ -330,18 +321,15 @@ func TestPatch(t *testing.T) {
} }
func TestPatchWithCreateOnUpdate(t *testing.T) { func TestPatchWithCreateOnUpdate(t *testing.T) {
_, s, closeFn := framework.RunAMaster(nil) result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
defer closeFn() defer result.TearDownFn()
c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) c := clientset.NewForConfigOrDie(result.ClientConfig)
ns := framework.CreateTestingNamespace("patch-with-create", s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
endpointTemplate := &v1.Endpoints{ endpointTemplate := &v1.Endpoints{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "patchendpoint", Name: "patchendpoint",
Namespace: ns.Name, Namespace: "default",
}, },
Subsets: []v1.EndpointSubset{ Subsets: []v1.EndpointSubset{
{ {
@ -352,7 +340,7 @@ func TestPatchWithCreateOnUpdate(t *testing.T) {
} }
patchEndpoint := func(json []byte) (runtime.Object, error) { patchEndpoint := func(json []byte) (runtime.Object, error) {
return c.Core().RESTClient().Patch(types.MergePatchType).Resource("endpoints").Namespace(ns.Name).Name("patchendpoint").Body(json).Do().Get() return c.CoreV1().RESTClient().Patch(types.MergePatchType).Resource("endpoints").Namespace("default").Name("patchendpoint").Body(json).Do().Get()
} }
// Make sure patch doesn't get to CreateOnUpdate // Make sure patch doesn't get to CreateOnUpdate
@ -367,7 +355,7 @@ func TestPatchWithCreateOnUpdate(t *testing.T) {
} }
// Create the endpoint (endpoints set AllowCreateOnUpdate=true) to get a UID and resource version // Create the endpoint (endpoints set AllowCreateOnUpdate=true) to get a UID and resource version
createdEndpoint, err := c.Core().Endpoints(ns.Name).Update(endpointTemplate) createdEndpoint, err := c.CoreV1().Endpoints("default").Update(endpointTemplate)
if err != nil { if err != nil {
t.Fatalf("Failed creating endpoint: %v", err) t.Fatalf("Failed creating endpoint: %v", err)
} }
@ -441,12 +429,12 @@ func TestPatchWithCreateOnUpdate(t *testing.T) {
} }
func TestAPIVersions(t *testing.T) { func TestAPIVersions(t *testing.T) {
_, s, closeFn := framework.RunAMaster(nil) result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
defer closeFn() defer result.TearDownFn()
c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) c := clientset.NewForConfigOrDie(result.ClientConfig)
clientVersion := c.Core().RESTClient().APIVersion().String() clientVersion := c.CoreV1().RESTClient().APIVersion().String()
g, err := c.Discovery().ServerGroups() g, err := c.Discovery().ServerGroups()
if err != nil { if err != nil {
t.Fatalf("Failed to get api versions: %v", err) t.Fatalf("Failed to get api versions: %v", err)
@ -463,23 +451,20 @@ func TestAPIVersions(t *testing.T) {
} }
func TestSingleWatch(t *testing.T) { func TestSingleWatch(t *testing.T) {
_, s, closeFn := framework.RunAMaster(nil) result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
defer closeFn() defer result.TearDownFn()
ns := framework.CreateTestingNamespace("single-watch", s, t) client := clientset.NewForConfigOrDie(result.ClientConfig)
defer framework.DeleteTestingNamespace(ns, s, t)
client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
mkEvent := func(i int) *v1.Event { mkEvent := func(i int) *v1.Event {
name := fmt.Sprintf("event-%v", i) name := fmt.Sprintf("event-%v", i)
return &v1.Event{ return &v1.Event{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Namespace: ns.Name, Namespace: "default",
Name: name, Name: name,
}, },
InvolvedObject: v1.ObjectReference{ InvolvedObject: v1.ObjectReference{
Namespace: ns.Name, Namespace: "default",
Name: name, Name: name,
}, },
Reason: fmt.Sprintf("event %v", i), Reason: fmt.Sprintf("event %v", i),
@ -489,7 +474,7 @@ func TestSingleWatch(t *testing.T) {
rv1 := "" rv1 := ""
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
event := mkEvent(i) event := mkEvent(i)
got, err := client.Core().Events(ns.Name).Create(event) got, err := client.CoreV1().Events("default").Create(event)
if err != nil { if err != nil {
t.Fatalf("Failed creating event %#q: %v", event, err) t.Fatalf("Failed creating event %#q: %v", event, err)
} }
@ -502,8 +487,8 @@ func TestSingleWatch(t *testing.T) {
t.Logf("Created event %#v", got.ObjectMeta) t.Logf("Created event %#v", got.ObjectMeta)
} }
w, err := client.Core().RESTClient().Get(). w, err := client.CoreV1().RESTClient().Get().
Namespace(ns.Name). Namespace("default").
Resource("events"). Resource("events").
VersionedParams(&metav1.ListOptions{ VersionedParams(&metav1.ListOptions{
ResourceVersion: rv1, ResourceVersion: rv1,
@ -550,24 +535,21 @@ func TestMultiWatch(t *testing.T) {
const watcherCount = 50 const watcherCount = 50
rt.GOMAXPROCS(watcherCount) rt.GOMAXPROCS(watcherCount)
_, s, closeFn := framework.RunAMaster(nil) result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
defer closeFn() defer result.TearDownFn()
ns := framework.CreateTestingNamespace("multi-watch", s, t) client := clientset.NewForConfigOrDie(result.ClientConfig)
defer framework.DeleteTestingNamespace(ns, s, t)
client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
dummyEvent := func(i int) *v1.Event { dummyEvent := func(i int) *v1.Event {
name := fmt.Sprintf("unrelated-%v", i) name := fmt.Sprintf("unrelated-%v", i)
return &v1.Event{ return &v1.Event{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%v.%x", name, time.Now().UnixNano()), Name: fmt.Sprintf("%v.%x", name, time.Now().UnixNano()),
Namespace: ns.Name, Namespace: "default",
}, },
InvolvedObject: v1.ObjectReference{ InvolvedObject: v1.ObjectReference{
Name: name, Name: name,
Namespace: ns.Name, Namespace: "default",
}, },
Reason: fmt.Sprintf("unrelated change %v", i), Reason: fmt.Sprintf("unrelated change %v", i),
} }
@ -585,7 +567,7 @@ func TestMultiWatch(t *testing.T) {
for i := 0; i < watcherCount; i++ { for i := 0; i < watcherCount; i++ {
watchesStarted.Add(1) watchesStarted.Add(1)
name := fmt.Sprintf("multi-watch-%v", i) name := fmt.Sprintf("multi-watch-%v", i)
got, err := client.Core().Pods(ns.Name).Create(&v1.Pod{ got, err := client.CoreV1().Pods("default").Create(&v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: name, Name: name,
Labels: labels.Set{"watchlabel": name}, Labels: labels.Set{"watchlabel": name},
@ -606,7 +588,7 @@ func TestMultiWatch(t *testing.T) {
LabelSelector: labels.Set{"watchlabel": name}.AsSelector().String(), LabelSelector: labels.Set{"watchlabel": name}.AsSelector().String(),
ResourceVersion: rv, ResourceVersion: rv,
} }
w, err := client.Core().Pods(ns.Name).Watch(options) w, err := client.CoreV1().Pods("default").Watch(options)
if err != nil { if err != nil {
panic(fmt.Sprintf("watch error for %v: %v", name, err)) panic(fmt.Sprintf("watch error for %v: %v", name, err))
} }
@ -655,7 +637,7 @@ func TestMultiWatch(t *testing.T) {
if !ok { if !ok {
return return
} }
if _, err := client.Core().Events(ns.Name).Create(dummyEvent(i)); err != nil { if _, err := client.CoreV1().Events("default").Create(dummyEvent(i)); err != nil {
panic(fmt.Sprintf("couldn't make an event: %v", err)) panic(fmt.Sprintf("couldn't make an event: %v", err))
} }
changeMade <- i changeMade <- i
@ -692,7 +674,7 @@ func TestMultiWatch(t *testing.T) {
return return
} }
name := fmt.Sprintf("unrelated-%v", i) name := fmt.Sprintf("unrelated-%v", i)
_, err := client.Core().Pods(ns.Name).Create(&v1.Pod{ _, err := client.CoreV1().Pods("default").Create(&v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: name, Name: name,
}, },
@ -726,13 +708,13 @@ func TestMultiWatch(t *testing.T) {
for i := 0; i < watcherCount; i++ { for i := 0; i < watcherCount; i++ {
go func(i int) { go func(i int) {
name := fmt.Sprintf("multi-watch-%v", i) name := fmt.Sprintf("multi-watch-%v", i)
pod, err := client.Core().Pods(ns.Name).Get(name, metav1.GetOptions{}) pod, err := client.CoreV1().Pods("default").Get(name, metav1.GetOptions{})
if err != nil { if err != nil {
panic(fmt.Sprintf("Couldn't get %v: %v", name, err)) panic(fmt.Sprintf("Couldn't get %v: %v", name, err))
} }
pod.Spec.Containers[0].Image = imageutils.GetPauseImageName() pod.Spec.Containers[0].Image = imageutils.GetPauseImageName()
sentTimes <- timePair{time.Now(), name} sentTimes <- timePair{time.Now(), name}
if _, err := client.Core().Pods(ns.Name).Update(pod); err != nil { if _, err := client.CoreV1().Pods("default").Update(pod); err != nil {
panic(fmt.Sprintf("Couldn't make %v: %v", name, err)) panic(fmt.Sprintf("Couldn't make %v: %v", name, err))
} }
}(i) }(i)
@ -806,13 +788,10 @@ func runSelfLinkTestOnNamespace(t *testing.T, c clientset.Interface, namespace s
} }
func TestSelfLinkOnNamespace(t *testing.T) { func TestSelfLinkOnNamespace(t *testing.T) {
_, s, closeFn := framework.RunAMaster(nil) result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd())
defer closeFn() defer result.TearDownFn()
ns := framework.CreateTestingNamespace("selflink", s, t) c := clientset.NewForConfigOrDie(result.ClientConfig)
defer framework.DeleteTestingNamespace(ns, s, t)
c := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) runSelfLinkTestOnNamespace(t, c, "default")
runSelfLinkTestOnNamespace(t, c, ns.Name)
} }

54
test/integration/client/dynamic_client_test.go
View File

@ -32,26 +32,17 @@ import (
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/dynamic" "k8s.io/client-go/dynamic"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest" kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/framework"
) )
func TestDynamicClient(t *testing.T) { func TestDynamicClient(t *testing.T) {
_, s, closeFn := framework.RunAMaster(nil) result := kubeapiservertesting.StartTestServerOrDie(t, nil, []string{"--disable-admission-plugins", "ServiceAccount"}, framework.SharedEtcd())
defer closeFn() defer result.TearDownFn()
ns := framework.CreateTestingNamespace("dynamic-client", s, t) client := clientset.NewForConfigOrDie(result.ClientConfig)
defer framework.DeleteTestingNamespace(ns, s, t) dynamicClient, err := dynamic.NewForConfig(result.ClientConfig)
gv := &schema.GroupVersion{Group: "", Version: "v1"}
config := &restclient.Config{
Host: s.URL,
ContentConfig: restclient.ContentConfig{GroupVersion: gv},
}
client := clientset.NewForConfigOrDie(config)
dynamicClient, err := dynamic.NewForConfig(config)
if err != nil { if err != nil {
t.Fatalf("unexpected error creating dynamic client: %v", err) t.Fatalf("unexpected error creating dynamic client: %v", err)
} }
@ -73,13 +64,13 @@ func TestDynamicClient(t *testing.T) {
}, },
} }
actual, err := client.Core().Pods(ns.Name).Create(pod) actual, err := client.CoreV1().Pods("default").Create(pod)
if err != nil { if err != nil {
t.Fatalf("unexpected error when creating pod: %v", err) t.Fatalf("unexpected error when creating pod: %v", err)
} }
// check dynamic list // check dynamic list
unstructuredList, err := dynamicClient.Resource(resource).Namespace(ns.Name).List(metav1.ListOptions{}) unstructuredList, err := dynamicClient.Resource(resource).Namespace("default").List(metav1.ListOptions{})
if err != nil { if err != nil {
t.Fatalf("unexpected error when listing pods: %v", err) t.Fatalf("unexpected error when listing pods: %v", err)
} }
@ -98,7 +89,7 @@ func TestDynamicClient(t *testing.T) {
} }
// check dynamic get // check dynamic get
unstruct, err := dynamicClient.Resource(resource).Namespace(ns.Name).Get(actual.Name, metav1.GetOptions{}) unstruct, err := dynamicClient.Resource(resource).Namespace("default").Get(actual.Name, metav1.GetOptions{})
if err != nil { if err != nil {
t.Fatalf("unexpected error when getting pod %q: %v", actual.Name, err) t.Fatalf("unexpected error when getting pod %q: %v", actual.Name, err)
} }
@ -113,12 +104,12 @@ func TestDynamicClient(t *testing.T) {
} }
// delete the pod dynamically // delete the pod dynamically
err = dynamicClient.Resource(resource).Namespace(ns.Name).Delete(actual.Name, nil) err = dynamicClient.Resource(resource).Namespace("default").Delete(actual.Name, nil)
if err != nil { if err != nil {
t.Fatalf("unexpected error when deleting pod: %v", err) t.Fatalf("unexpected error when deleting pod: %v", err)
} }
list, err := client.Core().Pods(ns.Name).List(metav1.ListOptions{}) list, err := client.CoreV1().Pods("default").List(metav1.ListOptions{})
if err != nil { if err != nil {
t.Fatalf("unexpected error when listing pods: %v", err) t.Fatalf("unexpected error when listing pods: %v", err)
} }
@ -129,20 +120,11 @@ func TestDynamicClient(t *testing.T) {
} }
func TestDynamicClientWatch(t *testing.T) { func TestDynamicClientWatch(t *testing.T) {
_, s, closeFn := framework.RunAMaster(nil) result := kubeapiservertesting.StartTestServerOrDie(t, nil, nil, framework.SharedEtcd())
defer closeFn() defer result.TearDownFn()
ns := framework.CreateTestingNamespace("dynamic-watch", s, t) client := clientset.NewForConfigOrDie(result.ClientConfig)
defer framework.DeleteTestingNamespace(ns, s, t) dynamicClient, err := dynamic.NewForConfig(result.ClientConfig)
gv := &schema.GroupVersion{Group: "", Version: "v1"}
config := &restclient.Config{
Host: s.URL,
ContentConfig: restclient.ContentConfig{GroupVersion: gv},
}
client := clientset.NewForConfigOrDie(config)
dynamicClient, err := dynamic.NewForConfig(config)
if err != nil { if err != nil {
t.Fatalf("unexpected error creating dynamic client: %v", err) t.Fatalf("unexpected error creating dynamic client: %v", err)
} }
@ -153,11 +135,11 @@ func TestDynamicClientWatch(t *testing.T) {
name := fmt.Sprintf("event-%v", i) name := fmt.Sprintf("event-%v", i)
return &v1.Event{ return &v1.Event{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Namespace: ns.Name, Namespace: "default",
Name: name, Name: name,
}, },
InvolvedObject: v1.ObjectReference{ InvolvedObject: v1.ObjectReference{
Namespace: ns.Name, Namespace: "default",
Name: name, Name: name,
}, },
Reason: fmt.Sprintf("event %v", i), Reason: fmt.Sprintf("event %v", i),
@ -167,7 +149,7 @@ func TestDynamicClientWatch(t *testing.T) {
rv1 := "" rv1 := ""
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
event := mkEvent(i) event := mkEvent(i)
got, err := client.CoreV1().Events(ns.Name).Create(event) got, err := client.CoreV1().Events("default").Create(event)
if err != nil { if err != nil {
t.Fatalf("Failed creating event %#q: %v", event, err) t.Fatalf("Failed creating event %#q: %v", event, err)
} }
@ -180,7 +162,7 @@ func TestDynamicClientWatch(t *testing.T) {
t.Logf("Created event %#v", got.ObjectMeta) t.Logf("Created event %#v", got.ObjectMeta)
} }
w, err := dynamicClient.Resource(resource).Namespace(ns.Name).Watch(metav1.ListOptions{ w, err := dynamicClient.Resource(resource).Namespace("default").Watch(metav1.ListOptions{
ResourceVersion: rv1, ResourceVersion: rv1,
Watch: true, Watch: true,
FieldSelector: fields.OneTermEqualSelector("metadata.name", "event-9").String(), FieldSelector: fields.OneTermEqualSelector("metadata.name", "event-9").String(),