Merge pull request #67372 from tanshanshan/priority-814

Automatic merge from submit-queue (batch tested with PRs 67137, 67372, 67505, 67373, 67357). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix apiserver crashed when priority classs already exists **What this PR does / why we need it**: when priority classs already exists , ignore error **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #67367 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #67372 from tanshanshan/priority-814
d17bbf8d · Kubernetes Submit Queue · GitHub · d3a0bb6a · a99b619c · d17bbf8d
Unverified Commit d17bbf8d authored Aug 16, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage_scheduling.go pkg/registry/scheduling/rest/storage_scheduling.go +1 -1

No files found.
--- a/pkg/registry/scheduling/rest/storage_scheduling.go
+++ b/pkg/registry/scheduling/rest/storage_scheduling.go
@@ -85,7 +85,7 @@ func AddSystemPriorityClasses() genericapiserver.PostStartHookFunc {
 				if err != nil {
 					if apierrors.IsNotFound(err) {
 						_, err := schedClientSet.PriorityClasses().Create(pc)
-						if err != nil {
+						if err != nil && !apierrors.IsAlreadyExists(err) {
 							return false, err
 						} else {
 							glog.Infof("created PriorityClass %s with value %v", pc.Name, pc.Value)