Skip to content

Commit 3e57d5c

Browse files
Gekko0114Gekko0114
committed
fix
1 parent cd0e0fc commit 3e57d5c

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

‎test/integration/scheduler/queue_test.go‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ func TestSchedulingGates(t *testing.T) {
189189
// TestCoreResourceEnqueue verify Pods failed by in-tree default plugins can be
190190
// moved properly upon their registered events.
191191
func TestCoreResourceEnqueue(t *testing.T) {
192-
volType := v1.HostPathDirectoryOrCreate
193192
tests := []struct {
194193
name string
195194
// initialNodes is the list of Nodes to be created at first.
@@ -769,7 +768,7 @@ func TestCoreResourceEnqueue(t *testing.T) {
769768
Labels(map[string]string{v1.LabelTopologyZone: "us-west1-a"}).
770769
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
771770
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
772-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
771+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
773772
Obj(),
774773
},
775774
initialPVCs: []*v1.PersistentVolumeClaim{
@@ -798,7 +797,7 @@ func TestCoreResourceEnqueue(t *testing.T) {
798797
pv2 := st.MakePersistentVolume().Name("pv2").Label(v1.LabelTopologyZone, "us-west1-a").
799798
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
800799
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
801-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
800+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
802801
Obj()
803802
if _, err := testCtx.ClientSet.CoreV1().PersistentVolumes().Create(testCtx.Ctx, pv2, metav1.CreateOptions{}); err != nil {
804803
return fmt.Errorf("failed to create pv2: %w", err)
@@ -817,14 +816,14 @@ func TestCoreResourceEnqueue(t *testing.T) {
817816
Labels(map[string]string{v1.LabelTopologyZone: "us-west1-a"}).
818817
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
819818
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
820-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
819+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
821820
Obj(),
822821
st.MakePersistentVolume().
823822
Name("pv2").
824823
Labels(map[string]string{v1.LabelTopologyZone: "us-east1"}).
825824
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
826825
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
827-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
826+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
828827
Obj(),
829828
},
830829
initialPVCs: []*v1.PersistentVolumeClaim{
@@ -853,7 +852,7 @@ func TestCoreResourceEnqueue(t *testing.T) {
853852
pv2 := st.MakePersistentVolume().Name("pv2").Label(v1.LabelTopologyZone, "us-west1-a").
854853
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
855854
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
856-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
855+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
857856
Obj()
858857
if _, err := testCtx.ClientSet.CoreV1().PersistentVolumes().Update(testCtx.Ctx, pv2, metav1.UpdateOptions{}); err != nil {
859858
return fmt.Errorf("failed to update pv2: %w", err)
@@ -872,14 +871,14 @@ func TestCoreResourceEnqueue(t *testing.T) {
872871
Labels(map[string]string{v1.LabelTopologyZone: "us-west1-a"}).
873872
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
874873
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
875-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
874+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
876875
Obj(),
877876
st.MakePersistentVolume().
878877
Name("pv2").
879878
Labels(map[string]string{v1.LabelTopologyZone: "us-east1"}).
880879
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
881880
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
882-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
881+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
883882
Obj(),
884883
},
885884
initialPVCs: []*v1.PersistentVolumeClaim{
@@ -923,14 +922,14 @@ func TestCoreResourceEnqueue(t *testing.T) {
923922
Labels(map[string]string{v1.LabelTopologyZone: "us-west1-a"}).
924923
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
925924
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
926-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
925+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
927926
Obj(),
928927
st.MakePersistentVolume().
929928
Name("pv2").
930929
Labels(map[string]string{v1.LabelTopologyZone: "us-east1"}).
931930
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
932931
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
933-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
932+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
934933
Obj(),
935934
},
936935
initialPVCs: []*v1.PersistentVolumeClaim{
@@ -980,7 +979,7 @@ func TestCoreResourceEnqueue(t *testing.T) {
980979
Labels(map[string]string{v1.LabelTopologyZone: "us-west1-a"}).
981980
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
982981
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
983-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
982+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
984983
Obj(),
985984
},
986985
initialPVCs: []*v1.PersistentVolumeClaim{
@@ -1028,14 +1027,14 @@ func TestCoreResourceEnqueue(t *testing.T) {
10281027
Labels(map[string]string{v1.LabelTopologyZone: "us-west1-a"}).
10291028
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
10301029
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
1031-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
1030+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
10321031
Obj(),
10331032
st.MakePersistentVolume().
10341033
Name("pv2").
10351034
Labels(map[string]string{v1.LabelTopologyZone: "us-east1"}).
10361035
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
10371036
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
1038-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
1037+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
10391038
Obj(),
10401039
},
10411040
initialPVCs: []*v1.PersistentVolumeClaim{
@@ -1065,7 +1064,7 @@ func TestCoreResourceEnqueue(t *testing.T) {
10651064
Labels(map[string]string{v1.LabelTopologyZone: "us-east1", "unrelated": "unrelated"}).
10661065
AccessModes([]v1.PersistentVolumeAccessMode{v1.ReadOnlyMany}).
10671066
Capacity(v1.ResourceList{v1.ResourceStorage: resource.MustParse("1Mi")}).
1068-
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: &volType}).
1067+
HostPathVolumeSource(&v1.HostPathVolumeSource{Path: "/tmp", Type: ptr.To(v1.HostPathDirectoryOrCreate)}).
10691068
Obj()
10701069
if _, err := testCtx.ClientSet.CoreV1().PersistentVolumes().Update(testCtx.Ctx, pv2, metav1.UpdateOptions{}); err != nil {
10711070
return fmt.Errorf("failed to update pv2: %w", err)

0 commit comments

Comments
 (0)