github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25816 from soltysh/scheduledjob_kubectl

Browse Source 
Automatic merge from submit-queue

ScheduledJob kubectl

@erictune the last part (kubectl) of the ScheduledJob, as usual builds on top of previous PRs, so only last 2 commits matter (the kubectl one and storage leftovers).

```release-note
* Introducing ScheduledJobs as described in [the proposal](https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/scheduledjob.md) as part of `batch/v2alpha1` version (experimental feature).
```
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
This commit is contained in:
Kubernetes Submit Queue
2016-08-04 17:36:07 -07:00
committed by GitHub
parent 4700b6fb3c b5c68a9015
commit 7921a9ce67
15 changed files with 344 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/master/storage_batch.go
View File

@@ -23,6 +23,7 @@ import (
batchapiv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
"k8s.io/kubernetes/pkg/genericapiserver"
jobetcd "k8s.io/kubernetes/pkg/registry/job/etcd"
scheduledjobetcd "k8s.io/kubernetes/pkg/registry/scheduledjob/etcd"
)
type BatchRESTStorageProvider struct{}
@@ -65,5 +66,10 @@ func (p BatchRESTStorageProvider) v2alpha1Storage(apiResourceConfigSource generi
storage["jobs"] = jobsStorage
storage["jobs/status"] = jobsStatusStorage
}
if apiResourceConfigSource.ResourceEnabled(version.WithResource("scheduledjobs")) {
scheduledJobsStorage, scheduledJobsStatusStorage := scheduledjobetcd.NewREST(restOptionsGetter(batch.Resource("scheduledjobs")))
storage["scheduledjobs"] = scheduledJobsStorage
storage["scheduledjobs/status"] = scheduledJobsStatusStorage
}
return storage
}