Merge pull request #54691 from wackxu/priadm

Automatic merge from submit-queue. 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>. update wrong group for priorityclasses **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #54690 **Special notes for your reviewer**: assgin @bsalamat **Release note**: ```release-note NONE ```

Merge pull request #54691 from wackxu/priadm
9c35982e · Kubernetes Submit Queue · GitHub · 3096a325 · 2430c24c · 9c35982e
Unverified Commit 9c35982e authored Oct 30, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

admission.go plugin/pkg/admission/priority/admission.go +1 -1

admission_test.go plugin/pkg/admission/priority/admission_test.go +4 -4

No files found.
--- a/plugin/pkg/admission/priority/admission.go
+++ b/plugin/pkg/admission/priority/admission.go
@@ -96,7 +96,7 @@ func (p *priorityPlugin) SetInternalKubeInformerFactory(f informers.SharedInform
 var (
 	podResource           = api.Resource("pods")
-	priorityClassResource = api.Resource("priorityclasses")
+	priorityClassResource = scheduling.Resource("priorityclasses")
 )
 // Admit checks Pods and PriorityClasses and admits or rejects them. It also resolves the priority of pods based on their PriorityClass.

--- a/plugin/pkg/admission/priority/admission_test.go
+++ b/plugin/pkg/admission/priority/admission_test.go
@@ -139,10 +139,10 @@ func TestPriorityClassAdmission(t *testing.T) {
 		attrs := admission.NewAttributesRecord(
 			test.newClass,
 			nil,
-			api.Kind("PriorityClass").WithVersion("version"),
+			scheduling.Kind("PriorityClass").WithVersion("version"),
 			"",
 			"",
-			api.Resource("priorityclasses").WithVersion("version"),
+			scheduling.Resource("priorityclasses").WithVersion("version"),
 			"",
 			admission.Create,
 			nil,
@@ -160,8 +160,8 @@ func TestPriorityClassAdmission(t *testing.T) {
 // TestDefaultPriority tests that default priority is resolved correctly.
 func TestDefaultPriority(t *testing.T) {
-	pcResource := api.Resource("priorityclasses").WithVersion("version")
+	pcResource := scheduling.Resource("priorityclasses").WithVersion("version")
-	pcKind := api.Kind("PriorityClass").WithVersion("version")
+	pcKind := scheduling.Kind("PriorityClass").WithVersion("version")
 	updatedDefaultClass1 := *defaultClass1
 	updatedDefaultClass1.GlobalDefault = false