@@ -896,6 +896,7 @@ func TestCoreResourceEnqueue(t *testing.T) {
896
896
},
897
897
pods : []* v1.Pod {
898
898
st .MakePod ().Name ("pod2" ).Container ("image" ).PVC ("pvc2" ).Obj (),
899
+ st .MakePod ().Name ("pod3" ).Container ("image" ).PVC ("pvc3" ).Obj (),
899
900
},
900
901
triggerFn : func (testCtx * testutils.TestContext ) error {
901
902
pvc2 := st .MakePersistentVolumeClaim ().
@@ -952,6 +953,7 @@ func TestCoreResourceEnqueue(t *testing.T) {
952
953
},
953
954
pods : []* v1.Pod {
954
955
st .MakePod ().Name ("pod2" ).Container ("image" ).PVC ("pvc2" ).Obj (),
956
+ st .MakePod ().Name ("pod3" ).Container ("image" ).PVC ("pvc3" ).Obj (),
955
957
},
956
958
triggerFn : func (testCtx * testutils.TestContext ) error {
957
959
pvc2 := st .MakePersistentVolumeClaim ().
@@ -1017,61 +1019,6 @@ func TestCoreResourceEnqueue(t *testing.T) {
1017
1019
wantRequeuedPods : sets .New ("pod2" ),
1018
1020
enableSchedulingQueueHint : []bool {true },
1019
1021
},
1020
- {
1021
- name : "Pod rejected with node by the VolumeZone plugin is not requeued when the unrelated PVC is added" ,
1022
- initialNodes : []* v1.Node {st .MakeNode ().Name ("fake-node" ).Label ("node" , "fake-node" ).Label (v1 .LabelTopologyZone , "us-west1-a" ).Obj ()},
1023
- initialPVs : []* v1.PersistentVolume {
1024
- st .MakePersistentVolume ().
1025
- Name ("pv1" ).
1026
- Labels (map [string ]string {v1 .LabelTopologyZone : "us-west1-a" }).
1027
- AccessModes ([]v1.PersistentVolumeAccessMode {v1 .ReadOnlyMany }).
1028
- Capacity (v1.ResourceList {v1 .ResourceStorage : resource .MustParse ("1Mi" )}).
1029
- HostPathVolumeSource (& v1.HostPathVolumeSource {Path : "/tmp" , Type : & volType }).
1030
- Obj (),
1031
- st .MakePersistentVolume ().
1032
- Name ("pv2" ).
1033
- Labels (map [string ]string {v1 .LabelTopologyZone : "us-east1" }).
1034
- AccessModes ([]v1.PersistentVolumeAccessMode {v1 .ReadOnlyMany }).
1035
- Capacity (v1.ResourceList {v1 .ResourceStorage : resource .MustParse ("1Mi" )}).
1036
- HostPathVolumeSource (& v1.HostPathVolumeSource {Path : "/tmp" , Type : & volType }).
1037
- Obj (),
1038
- },
1039
- initialPVCs : []* v1.PersistentVolumeClaim {
1040
- st .MakePersistentVolumeClaim ().
1041
- Name ("pvc1" ).
1042
- Annotation (volume .AnnBindCompleted , "true" ).
1043
- VolumeName ("pv1" ).
1044
- AccessModes ([]v1.PersistentVolumeAccessMode {v1 .ReadWriteOncePod }).
1045
- Resources (v1.VolumeResourceRequirements {Requests : v1.ResourceList {v1 .ResourceStorage : resource .MustParse ("1Mi" )}}).
1046
- Obj (),
1047
- st .MakePersistentVolumeClaim ().
1048
- Name ("pvc2" ).
1049
- Annotation (volume .AnnBindCompleted , "true" ).
1050
- AccessModes ([]v1.PersistentVolumeAccessMode {v1 .ReadWriteOncePod }).
1051
- Resources (v1.VolumeResourceRequirements {Requests : v1.ResourceList {v1 .ResourceStorage : resource .MustParse ("1Mi" )}}).
1052
- Obj (),
1053
- },
1054
- initialPods : []* v1.Pod {
1055
- st .MakePod ().Name ("pod1" ).Container ("image" ).PVC ("pvc1" ).Node ("fake-node" ).Obj (),
1056
- },
1057
- pods : []* v1.Pod {
1058
- st .MakePod ().Name ("pod2" ).Container ("image" ).PVC ("pvc2" ).Obj (),
1059
- },
1060
- triggerFn : func (testCtx * testutils.TestContext ) error {
1061
- pvc3 := st .MakePersistentVolumeClaim ().
1062
- Name ("pvc3" ).
1063
- Annotation (volume .AnnBindCompleted , "true" ).
1064
- AccessModes ([]v1.PersistentVolumeAccessMode {v1 .ReadWriteOncePod }).
1065
- Resources (v1.VolumeResourceRequirements {Requests : v1.ResourceList {v1 .ResourceStorage : resource .MustParse ("1Mi" )}}).
1066
- Obj ()
1067
- if _ , err := testCtx .ClientSet .CoreV1 ().PersistentVolumeClaims (testCtx .NS .Name ).Create (testCtx .Ctx , pvc3 , metav1.CreateOptions {}); err != nil {
1068
- return fmt .Errorf ("failed to create pvc3: %w" , err )
1069
- }
1070
- return nil
1071
- },
1072
- wantRequeuedPods : sets.Set [string ]{},
1073
- enableSchedulingQueueHint : []bool {true },
1074
- },
1075
1022
}
1076
1023
1077
1024
for _ , tt := range tests {
0 commit comments