Skip to content

Commit 66b42b7

Browse files
natasharommnatasharomm
authored
Fix priorityclass not namespaced (#279)
* priority classes are not namespaced - little fix * little fix ti test * fix test
1 parent 6c3fcbd commit 66b42b7

File tree

3 files changed

+24
-47
lines changed

3 files changed

+24
-47
lines changed

‎pkg/podgroupcontroller/controllers/status_updater_test.go‎

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ func Test_handlePodGroupStatus(t *testing.T) {
7676
[]client.Object{
7777
&schedulingv1.PriorityClass{
7878
ObjectMeta: metav1.ObjectMeta{
79-
Name: "c1",
80-
Namespace: "n1",
79+
Name: "c1",
8180
},
8281
Value: 75,
8382
},
@@ -137,8 +136,7 @@ func Test_handlePodGroupStatus(t *testing.T) {
137136
[]client.Object{
138137
&schedulingv1.PriorityClass{
139138
ObjectMeta: metav1.ObjectMeta{
140-
Name: "c1",
141-
Namespace: "n1",
139+
Name: "c1",
142140
},
143141
Value: 75,
144142
},
@@ -205,15 +203,13 @@ func Test_handlePodGroupStatus(t *testing.T) {
205203
[]client.Object{
206204
&schedulingv1.PriorityClass{
207205
ObjectMeta: metav1.ObjectMeta{
208-
Name: "c1",
209-
Namespace: "n1",
206+
Name: "c1",
210207
},
211208
Value: 75,
212209
},
213210
&schedulingv1.PriorityClass{
214211
ObjectMeta: metav1.ObjectMeta{
215-
Name: "c2",
216-
Namespace: "n1",
212+
Name: "c2",
217213
},
218214
Value: 100,
219215
},
@@ -273,15 +269,13 @@ func Test_handlePodGroupStatus(t *testing.T) {
273269
[]client.Object{
274270
&schedulingv1.PriorityClass{
275271
ObjectMeta: metav1.ObjectMeta{
276-
Name: "c1",
277-
Namespace: "n1",
272+
Name: "c1",
278273
},
279274
Value: 75,
280275
},
281276
&schedulingv1.PriorityClass{
282277
ObjectMeta: metav1.ObjectMeta{
283-
Name: "c2",
284-
Namespace: "n1",
278+
Name: "c2",
285279
},
286280
Value: 100,
287281
},
@@ -346,15 +340,13 @@ func Test_handlePodGroupStatus(t *testing.T) {
346340
[]client.Object{
347341
&schedulingv1.PriorityClass{
348342
ObjectMeta: metav1.ObjectMeta{
349-
Name: "c1",
350-
Namespace: "n1",
343+
Name: "c1",
351344
},
352345
Value: 75,
353346
},
354347
&schedulingv1.PriorityClass{
355348
ObjectMeta: metav1.ObjectMeta{
356-
Name: "c2",
357-
Namespace: "n1",
349+
Name: "c2",
358350
},
359351
Value: 100,
360352
},
@@ -423,15 +415,13 @@ func Test_handlePodGroupStatus(t *testing.T) {
423415
[]client.Object{
424416
&schedulingv1.PriorityClass{
425417
ObjectMeta: metav1.ObjectMeta{
426-
Name: "c1",
427-
Namespace: "n1",
418+
Name: "c1",
428419
},
429420
Value: 75,
430421
},
431422
&schedulingv1.PriorityClass{
432423
ObjectMeta: metav1.ObjectMeta{
433-
Name: "c2",
434-
Namespace: "n1",
424+
Name: "c2",
435425
},
436426
Value: 100,
437427
},
@@ -494,15 +484,13 @@ func Test_handlePodGroupStatus(t *testing.T) {
494484
[]client.Object{
495485
&schedulingv1.PriorityClass{
496486
ObjectMeta: metav1.ObjectMeta{
497-
Name: "c1",
498-
Namespace: "n1",
487+
Name: "c1",
499488
},
500489
Value: 75,
501490
},
502491
&schedulingv1.PriorityClass{
503492
ObjectMeta: metav1.ObjectMeta{
504-
Name: "c2",
505-
Namespace: "n1",
493+
Name: "c2",
506494
},
507495
Value: 100,
508496
},
@@ -565,15 +553,13 @@ func Test_handlePodGroupStatus(t *testing.T) {
565553
[]client.Object{
566554
&schedulingv1.PriorityClass{
567555
ObjectMeta: metav1.ObjectMeta{
568-
Name: "c1",
569-
Namespace: "n1",
556+
Name: "c1",
570557
},
571558
Value: 75,
572559
},
573560
&schedulingv1.PriorityClass{
574561
ObjectMeta: metav1.ObjectMeta{
575-
Name: "c2",
576-
Namespace: "n1",
562+
Name: "c2",
577563
},
578564
Value: 100,
579565
},
@@ -636,8 +622,7 @@ func Test_handlePodGroupStatus(t *testing.T) {
636622
[]client.Object{
637623
&schedulingv1.PriorityClass{
638624
ObjectMeta: metav1.ObjectMeta{
639-
Name: "c1",
640-
Namespace: "n1",
625+
Name: "c1",
641626
},
642627
Value: 75,
643628
},
@@ -718,8 +703,7 @@ func Test_handlePodGroupStatus(t *testing.T) {
718703
[]client.Object{
719704
&schedulingv1.PriorityClass{
720705
ObjectMeta: metav1.ObjectMeta{
721-
Name: "c1",
722-
Namespace: "n1",
706+
Name: "c1",
723707
},
724708
Value: 75,
725709
},

‎pkg/podgroupcontroller/utilities/pod-group/preemptible.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func getPodGroupPriority(ctx context.Context, podGroup *v2alpha2.PodGroup, kubeC
4242
priorityClass := schedulingv1.PriorityClass{}
4343
err := kubeClient.Get(
4444
ctx,
45-
types.NamespacedName{Namespace: podGroup.Namespace, Name: podGroup.Spec.PriorityClassName},
45+
types.NamespacedName{Name: podGroup.Spec.PriorityClassName},
4646
&priorityClass,
4747
)
4848
if err != nil {

‎pkg/podgroupcontroller/utilities/pod-group/preemptible_test.go‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ func TestIsPreemptibleJob(t *testing.T) {
4141
[]client.Object{
4242
&schedulingv1.PriorityClass{
4343
ObjectMeta: metav1.ObjectMeta{
44-
Name: "c1",
45-
Namespace: "n1",
44+
Name: "c1",
4645
},
4746
Value: 75,
4847
},
4948
&schedulingv1.PriorityClass{
5049
ObjectMeta: metav1.ObjectMeta{
51-
Name: "c2",
52-
Namespace: "n1",
50+
Name: "c2",
5351
},
5452
Value: 125,
5553
},
@@ -72,15 +70,13 @@ func TestIsPreemptibleJob(t *testing.T) {
7270
[]client.Object{
7371
&schedulingv1.PriorityClass{
7472
ObjectMeta: metav1.ObjectMeta{
75-
Name: "c1",
76-
Namespace: "n1",
73+
Name: "c1",
7774
},
7875
Value: 75,
7976
},
8077
&schedulingv1.PriorityClass{
8178
ObjectMeta: metav1.ObjectMeta{
82-
Name: "c2",
83-
Namespace: "n1",
79+
Name: "c2",
8480
},
8581
Value: 125,
8682
},
@@ -103,8 +99,7 @@ func TestIsPreemptibleJob(t *testing.T) {
10399
[]client.Object{
104100
&schedulingv1.PriorityClass{
105101
ObjectMeta: metav1.ObjectMeta{
106-
Name: "c2",
107-
Namespace: "n1",
102+
Name: "c3",
108103
},
109104
Value: 125,
110105
},
@@ -127,8 +122,7 @@ func TestIsPreemptibleJob(t *testing.T) {
127122
[]client.Object{
128123
&schedulingv1.PriorityClass{
129124
ObjectMeta: metav1.ObjectMeta{
130-
Name: "c3",
131-
Namespace: "n1",
125+
Name: "c3",
132126
},
133127
Value: 83,
134128
},
@@ -151,8 +145,7 @@ func TestIsPreemptibleJob(t *testing.T) {
151145
[]client.Object{
152146
&schedulingv1.PriorityClass{
153147
ObjectMeta: metav1.ObjectMeta{
154-
Name: "c3",
155-
Namespace: "n1",
148+
Name: "c3",
156149
},
157150
Value: 200,
158151
},

0 commit comments

Comments
 (0)