Merge pull request #623 from k82cn/automated-cherry-pick-of-#622-upst…

…ream-release-0.4 Automated cherry pick of #622: Update doc & deployment.
kubernetes-retired · Mar 7, 2019 · 61e7fee · 61e7fee
2 parents a369ac5 + c559b69
commit 61e7fee
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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.