Merge branch 'master' into LintFixes

README.md

@@ -33,7 +33,7 @@ Some examples of the mechanisms and features that Volcano adds to Kubernetes are
     2. Fair-share scheduling
     3. Queue scheduling
     4. Preemption and reclaims
-    5. Reservartions and backfills
+    5. Reservations and backfills
     6. Topology-based scheduling
 3. Runtime extensions, e.g:
     1. Support for specialized continer runtimes like Singularity,

docs/design/drf - fairshare.md

@@ -175,5 +175,5 @@ All these plugin would choose some victims respective, and the intersection of t
     | queue | namespace | requested | queue assigned | namespace assigned |
     | ----- | --------- | --------- | -------------- | ------------------ |
     | q1 w1 | ns1 w2    |           | 4 cpu          |                    |
-    | q2 w3 | na1 w2    | 5 cpu     | 12 cpu         | 3 cpu              |
+    | q2 w3 | ns1 w2    | 5 cpu     | 12 cpu         | 3 cpu              |
     |       | ns2 w6    | 20 cpu    |                | 9 cpu              |

hack/update-gencode.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2019 The Volcano Authors.
+# Copyright 2014 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

hack/verify-gofmt.sh

@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2014 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 set -o errexit
 set -o nounset
 set -o pipefail

hack/verify-golint.sh

@@ -1,5 +1,19 @@
 #!/bin/bash
 
+# Copyright 2014 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 set -o errexit
 set -o nounset
 set -o pipefail

pkg/cli/job/delete.go

@@ -18,6 +18,7 @@ package job
 
 import (
 	"fmt"
+
 	"github.com/spf13/cobra"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -50,7 +51,7 @@ func DeleteJob() error {
 	}
 
 	if deleteJobFlags.JobName == "" {
-		err := fmt.Errorf("job name is mandaorty to delete a particular job")
+		err := fmt.Errorf("job name is mandatory to delete a particular job")
 		return err
 	}
 

pkg/cli/job/resume.go

@@ -18,6 +18,7 @@ package job
 
 import (
 	"fmt"
+
 	"github.com/spf13/cobra"
 
 	"volcano.sh/volcano/pkg/apis/batch/v1alpha1"
@@ -47,7 +48,7 @@ func ResumeJob() error {
 		return err
 	}
 	if resumeJobFlags.JobName == "" {
-		err := fmt.Errorf("job name is mandaorty to resume a particular job")
+		err := fmt.Errorf("job name is mandatory to resume a particular job")
 		return err
 	}
 

pkg/cli/job/suspend.go

@@ -48,7 +48,7 @@ func SuspendJob() error {
 	}
 
 	if suspendJobFlags.JobName == "" {
-		err := fmt.Errorf("job name is mandaorty to suspend a particular job")
+		err := fmt.Errorf("job name is mandatory to suspend a particular job")
 		return err
 	}
 

pkg/cli/job/view.go

@@ -54,7 +54,7 @@ func ViewJob() error {
 		return err
 	}
 	if viewJobFlags.JobName == "" {
-		err := fmt.Errorf("job name (specified by --name or -n) is mandaorty to view a particular job")
+		err := fmt.Errorf("job name (specified by --name or -n) is mandatory to view a particular job")
 		return err
 	}
 

pkg/cli/queue/get.go

@@ -52,7 +52,7 @@ func GetQueue() error {
 	}
 
 	if getQueueFlags.Name == "" {
-		err := fmt.Errorf("name is mandaorty to get the particular queue details")
+		err := fmt.Errorf("name is mandatory to get the particular queue details")
 		return err
 	}
 

pkg/cli/queue/util.go

@@ -21,6 +21,8 @@ import (
 
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
+	// Initialize client auth plugin.
+	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )
 
 func homeDir() string {

test/e2e/util.go

@@ -423,7 +423,7 @@ func jobUnschedulable(ctx *context, job *vkv1.Job, now time.Time) error {
 		for _, event := range events.Items {
 			target := event.InvolvedObject
 			if strings.HasPrefix(target.Name, pg.Name) && target.Namespace == pg.Namespace {
-				if event.Reason == string("Unschedulable") && event.LastTimestamp.After(now) {
+				if event.Reason == string("Unschedulable") || event.Reason == string("FailedScheduling") && event.LastTimestamp.After(now) {
 					return true, nil
 				}
 			}