github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

register batch/jobs to federated-apiserver

Browse Source
This commit is contained in:
jianhuiz
2016-12-20 18:03:20 -08:00
parent 17817bcc03
commit 196d663b40
8 changed files with 1226 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/registry/batch/job/etcd/etcd.go
View File

@@ -27,6 +27,21 @@ import (
"k8s.io/kubernetes/pkg/runtime"
)
// JobStorage includes dummy storage for Job.
type JobStorage struct {
Job *REST
Status *StatusREST
}
func NewStorage(optsGetter generic.RESTOptionsGetter) JobStorage {
jobRest, jobStatusRest := NewREST(optsGetter)
return JobStorage{
Job: jobRest,
Status: jobStatusRest,
}
}
// REST implements a RESTStorage for jobs against etcd
type REST struct {
*genericregistry.Store

42
pkg/registry/batch/job/etcd/etcd_test.go
View File

@@ -30,7 +30,7 @@ import (
etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"
)
func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) {
func newStorage(t *testing.T) (*JobStorage, *etcdtesting.EtcdTestServer) {
etcdStorage, server := registrytest.NewEtcdStorage(t, batch.GroupName)
restOptions := generic.RESTOptions{
StorageConfig: etcdStorage,
@@ -38,8 +38,8 @@ func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer)
DeleteCollectionWorkers: 1,
ResourcePrefix: "jobs",
}
jobStorage, statusStorage := NewREST(restOptions)
return jobStorage, statusStorage, server
jobStorage := NewStorage(restOptions)
return &jobStorage, server
}
func validNewJob() *batch.Job {
@@ -78,10 +78,10 @@ func validNewJob() *batch.Job {
}
func TestCreate(t *testing.T) {
storage, _, server := newStorage(t)
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store)
defer storage.Job.Store.DestroyFunc()
test := registrytest.New(t, storage.Job.Store)
validJob := validNewJob()
validJob.ObjectMeta = api.ObjectMeta{}
test.TestCreate(
@@ -99,10 +99,10 @@ func TestCreate(t *testing.T) {
}
func TestUpdate(t *testing.T) {
storage, _, server := newStorage(t)
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store)
defer storage.Job.Store.DestroyFunc()
test := registrytest.New(t, storage.Job.Store)
two := int32(2)
test.TestUpdate(
// valid
@@ -128,34 +128,34 @@ func TestUpdate(t *testing.T) {
}
func TestDelete(t *testing.T) {
storage, _, server := newStorage(t)
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store)
defer storage.Job.Store.DestroyFunc()
test := registrytest.New(t, storage.Job.Store)
test.TestDelete(validNewJob())
}
func TestGet(t *testing.T) {
storage, _, server := newStorage(t)
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store)
defer storage.Job.Store.DestroyFunc()
test := registrytest.New(t, storage.Job.Store)
test.TestGet(validNewJob())
}
func TestList(t *testing.T) {
storage, _, server := newStorage(t)
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store)
defer storage.Job.Store.DestroyFunc()
test := registrytest.New(t, storage.Job.Store)
test.TestList(validNewJob())
}
func TestWatch(t *testing.T) {
storage, _, server := newStorage(t)
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
test := registrytest.New(t, storage.Store)
defer storage.Job.Store.DestroyFunc()
test := registrytest.New(t, storage.Job.Store)
test.TestWatch(
validNewJob(),
// matching labels