From c559b69c5d893be03fd6bdaaedee97bb304b2af0 Mon Sep 17 00:00:00 2001 From: "Da K. Ma" Date: Thu, 7 Mar 2019 13:50:32 +0800 Subject: [PATCH] Update doc & deployment. Signed-off-by: Da K. Ma --- config/crds/scheduling_v1alpha1_podgroup.yaml | 4 ++++ deployment/kube-batch/templates/default.yaml | 6 ++++++ .../kube-batch/templates/scheduling_v1alpha1_podgroup.yaml | 6 +++++- doc/usage/tutorial.md | 6 +++--- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 deployment/kube-batch/templates/default.yaml diff --git a/config/crds/scheduling_v1alpha1_podgroup.yaml b/config/crds/scheduling_v1alpha1_podgroup.yaml index 1432fc160..e2ecb990f 100644 --- a/config/crds/scheduling_v1alpha1_podgroup.yaml +++ b/config/crds/scheduling_v1alpha1_podgroup.yaml @@ -22,6 +22,10 @@ spec: minMember: format: int32 type: integer + queue: + type: string + priorityClassName: + type: string type: object status: properties: diff --git a/deployment/kube-batch/templates/default.yaml b/deployment/kube-batch/templates/default.yaml new file mode 100644 index 000000000..3aa233f5d --- /dev/null +++ b/deployment/kube-batch/templates/default.yaml @@ -0,0 +1,6 @@ +apiVersion: scheduling.incubator.k8s.io/v1alpha1 +kind: Queue +metadata: + name: default +spec: + weight: 1 diff --git a/deployment/kube-batch/templates/scheduling_v1alpha1_podgroup.yaml b/deployment/kube-batch/templates/scheduling_v1alpha1_podgroup.yaml index 427d859ee..e2ecb990f 100644 --- a/deployment/kube-batch/templates/scheduling_v1alpha1_podgroup.yaml +++ b/deployment/kube-batch/templates/scheduling_v1alpha1_podgroup.yaml @@ -19,9 +19,13 @@ spec: type: object spec: properties: - numMember: + minMember: format: int32 type: integer + queue: + type: string + priorityClassName: + type: string type: object status: properties: diff --git a/doc/usage/tutorial.md b/doc/usage/tutorial.md index be6b4961a..84314dc20 100644 --- a/doc/usage/tutorial.md +++ b/doc/usage/tutorial.md @@ -11,10 +11,10 @@ To run `kube-batch`, a Kubernetes cluster must start up. Here is a document on [ ### (1) kube-batch image -An official kube-batch image is provided and you can download it from [DockerHub](https://hub.docker.com/r/kubesigs/kube-batch/). The version is `v0.4` now. +An official kube-batch image is provided and you can download it from [DockerHub](https://hub.docker.com/r/kubesigs/kube-batch/). The version is `v0.4.1` now. ```bash -# docker pull kubesigs/kube-batch:v0.4 +# docker pull kubesigs/kube-batch:v0.4.1 ``` ### (2) Create a Kubernetes Deployment for kube-batch @@ -40,7 +40,7 @@ Verify the release ```bash # helm list NAME REVISION UPDATED STATUS CHART NAMESPACE -dozing-otter 1 Thu Jun 14 18:52:15 2018 DEPLOYED kube-batch-0.4.0 kube-system +dozing-otter 1 Thu Jun 14 18:52:15 2018 DEPLOYED kube-batch-0.4.1 kube-system ``` NOTE: `kube-batch` need to collect cluster information(such as Pod, Node, CRD, etc) for scheduling, so the service account used by the deployment must have permission to access those cluster resources, otherwise, `kube-batch` will fail to startup. For users who are not familiar with Kubernetes RBAC, please copy the example/role.yaml into `$GOPATH/src/github.com/kubernetes-sigs/kube-batch/deployment/kube-batch/templates/` and reinstall batch.