Merge pull request #634 from k82cn/automated-cherry-pick-of-#630-#631-#…

…632-#633-upstream-release-0.4

Automated cherry pick of #630: v0.4.1 Release Notes #631: Add helm hook crd-install to fix helm install error #632: Set schedConf to defaultSchedulerConf if failing to #633: Added new PRs.

CHANGLOG.md

@@ -1,3 +1,36 @@
+## v0.4.1
+
+### Notes:
+
+  * Added NodeOrder Plugin
+  * Added Conformance Plugin
+  * Removed namespaceAsQueue feature
+  * Supported Pod without PodGroup
+  * Added performance metrics for scheduling
+
+### Issues:
+
+  * [#632](https://github.com/kubernetes-sigs/kube-batch/pull/632) Set schedConf to defaultSchedulerConf if failing to readSchedulerConf ([@hex108](https://github.com/hex108))
+  * [#631](https://github.com/kubernetes-sigs/kube-batch/pull/631) Add helm hook crd-install to fix helm install error ([@hex108](https://github.com/hex108))
+  * [#584](https://github.com/kubernetes-sigs/kube-batch/pull/584) Replaced FIFO by workqueue. ([@k82cn](https://github.com/k82cn))
+  * [#585](https://github.com/kubernetes-sigs/kube-batch/pull/585) Removed invalid error log. ([@k82cn](https://github.com/k82cn))
+  * [#594](https://github.com/kubernetes-sigs/kube-batch/pull/594) Fixed Job.Clone issue. ([@k82cn](https://github.com/k82cn))
+  * [#600](https://github.com/kubernetes-sigs/kube-batch/pull/600) Fixed duplicated queue in preempt action. ([@k82cn](https://github.com/k82cn))
+  * [#596](https://github.com/kubernetes-sigs/kube-batch/pull/596) Set default PodGroup for Pods. ([@k82cn](https://github.com/k82cn))
+  * [#587](https://github.com/kubernetes-sigs/kube-batch/pull/587) Adding node priority ([@thandayuthapani](https://github.com/thandayuthapani))
+  * [#607](https://github.com/kubernetes-sigs/kube-batch/pull/607) Fixed flaky test. ([@k82cn](https://github.com/k82cn))
+  * [#610](https://github.com/kubernetes-sigs/kube-batch/pull/610) Updated log level. ([@k82cn](https://github.com/k82cn))
+  * [#609](https://github.com/kubernetes-sigs/kube-batch/pull/609) Added conformance plugin. ([@k82cn](https://github.com/k82cn))
+  * [#604](https://github.com/kubernetes-sigs/kube-batch/pull/604) Moved default implementation from pkg. ([@k82cn](https://github.com/k82cn))
+  * [#613](https://github.com/kubernetes-sigs/kube-batch/pull/613) Removed namespaceAsQueue. ([@k82cn](https://github.com/k82cn))
+  * [#615](https://github.com/kubernetes-sigs/kube-batch/pull/615) Handled minAvailable task everytime. ([@k82cn](https://github.com/k82cn))
+  * [#603](https://github.com/kubernetes-sigs/kube-batch/pull/603) Added PriorityClass to PodGroup. ([@k82cn](https://github.com/k82cn))
+  * [#618](https://github.com/kubernetes-sigs/kube-batch/pull/618) Added JobPriority e2e. ([@k82cn](https://github.com/k82cn))
+  * [#622](https://github.com/kubernetes-sigs/kube-batch/pull/622) Update doc & deployment. ([@k82cn](https://github.com/k82cn))
+  * [#626](https://github.com/kubernetes-sigs/kube-batch/pull/626) Fix helm deployment ([@thandayuthapani](https://github.com/thandayuthapani))
+  * [#625](https://github.com/kubernetes-sigs/kube-batch/pull/625) Rename PrioritizeFn to NodeOrderFn ([@thandayuthapani](https://github.com/thandayuthapani))
+  * [#592](https://github.com/kubernetes-sigs/kube-batch/pull/592) Add performance metrics for scheduling ([@Jeffwan](https://github.com/Jeffwan))
+
 ## v0.4
 
 ### Notes:

Makefile

@@ -1,5 +1,5 @@
 BIN_DIR=_output/bin
-RELEASE_VER=v0.4
+RELEASE_VER=v0.4.1
 REPO_PATH=github.com/kubernetes-sigs/kube-batch
 GitSHA=`git rev-parse HEAD`
 Date=`date "+%Y-%m-%d %H:%M:%S"`

deployment/kube-batch/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1alpha1
 description: The batch scheduler of Kubernetes
 name: kube-batch
-version: 0.4.0
+version: 0.4.1

deployment/kube-batch/templates/scheduling_v1alpha1_podgroup.yaml

@@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: podgroups.scheduling.incubator.k8s.io
+  annotations:
+    "helm.sh/hook": "crd-install"
 spec:
   group: scheduling.incubator.k8s.io
   names:

deployment/kube-batch/templates/scheduling_v1alpha1_queue.yaml

@@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: queues.scheduling.incubator.k8s.io
+  annotations:
+    "helm.sh/hook": "crd-install"
 spec:
   group: scheduling.incubator.k8s.io
   names:

deployment/kube-batch/values.yaml

@@ -4,7 +4,7 @@
 replicaCount: 1
 image:
   repository: kubesigs
-  tag: v0.4
+  tag: v0.4.1
   pullPolicy: IfNotPresent
 resources:
   limits:

pkg/scheduler/scheduler.go

@@ -70,6 +70,7 @@ func (pc *Scheduler) Run(stopCh <-chan struct{}) {
 		if schedConf, err = readSchedulerConf(pc.schedulerConf); err != nil {
 			glog.Errorf("Failed to read scheduler configuration '%s', using default configuration: %v",
 				pc.schedulerConf, err)
+			schedConf = defaultSchedulerConf
 		}
 	}