github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update wrong group for priorityclasses

pull/6/head
wackxu 2017-10-27 18:02:48 +08:00
parent 7f991a3b53
commit 2430c24c61
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/pkg/admission/priority/admission.go
View File

@ -96,7 +96,7 @@ func (p *priorityPlugin) SetInternalKubeInformerFactory(f informers.SharedInform
var ( var (
podResource = api.Resource("pods") 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. // Admit checks Pods and PriorityClasses and admits or rejects them. It also resolves the priority of pods based on their PriorityClass.

8
plugin/pkg/admission/priority/admission_test.go
View File

@ -139,10 +139,10 @@ func TestPriorityClassAdmission(t *testing.T) {
attrs := admission.NewAttributesRecord( attrs := admission.NewAttributesRecord(
test.newClass, test.newClass,
nil, nil,
api.Kind("PriorityClass").WithVersion("version"), scheduling.Kind("PriorityClass").WithVersion("version"),
"", "",
"", "",
api.Resource("priorityclasses").WithVersion("version"), scheduling.Resource("priorityclasses").WithVersion("version"),
"", "",
admission.Create, admission.Create,
nil, nil,
@ -160,8 +160,8 @@ func TestPriorityClassAdmission(t *testing.T) {
// TestDefaultPriority tests that default priority is resolved correctly. // TestDefaultPriority tests that default priority is resolved correctly.
func TestDefaultPriority(t *testing.T) { 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 := *defaultClass1
updatedDefaultClass1.GlobalDefault = false updatedDefaultClass1.GlobalDefault = false