Skip to content

Commit f9a9b6f

Browse files
huww98huww98
committed
rename Gid => GID
according to stylecheck
1 parent ce81cc7 commit f9a9b6f

12 files changed

+74
-74
lines changed

‎pkg/kubelet/volumemanager/cache/actual_state_of_world.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@ type mountedPod struct {
370370
// call for volumes that do not need to update contents should not fail.
371371
remountRequired bool
372372

373-
// volumeGidValue contains the value of the GID annotation, if present.
374-
volumeGidValue string
373+
// volumeGIDValue contains the value of the GID annotation, if present.
374+
volumeGIDValue string
375375

376376
// volumeMountStateForPod stores state of volume mount for the pod. if it is:
377377
// - VolumeMounted: means volume for pod has been successfully mounted
@@ -484,7 +484,7 @@ func (asw *actualStateOfWorld) CheckAndMarkVolumeAsUncertainViaReconstruction(op
484484
mounter := opts.Mounter
485485
blockVolumeMapper := opts.BlockVolumeMapper
486486
outerVolumeSpecName := opts.OuterVolumeSpecName
487-
volumeGidValue := opts.VolumeGidVolume
487+
volumeGIDValue := opts.VolumeGIDVolume
488488
volumeSpec := opts.VolumeSpec
489489

490490
podObj = mountedPod{
@@ -493,7 +493,7 @@ func (asw *actualStateOfWorld) CheckAndMarkVolumeAsUncertainViaReconstruction(op
493493
mounter: mounter,
494494
blockVolumeMapper: blockVolumeMapper,
495495
outerVolumeSpecName: outerVolumeSpecName,
496-
volumeGidValue: volumeGidValue,
496+
volumeGIDValue: volumeGIDValue,
497497
volumeSpec: volumeSpec,
498498
remountRequired: false,
499499
volumeMountStateForPod: operationexecutor.VolumeMountUncertain,
@@ -731,7 +731,7 @@ func (asw *actualStateOfWorld) AddPodToVolume(markVolumeOpts operationexecutor.M
731731
mounter := markVolumeOpts.Mounter
732732
blockVolumeMapper := markVolumeOpts.BlockVolumeMapper
733733
outerVolumeSpecName := markVolumeOpts.OuterVolumeSpecName
734-
volumeGidValue := markVolumeOpts.VolumeGidVolume
734+
volumeGIDValue := markVolumeOpts.VolumeGIDVolume
735735
volumeSpec := markVolumeOpts.VolumeSpec
736736
asw.Lock()
737737
defer asw.Unlock()
@@ -760,7 +760,7 @@ func (asw *actualStateOfWorld) AddPodToVolume(markVolumeOpts operationexecutor.M
760760
mounter: mounter,
761761
blockVolumeMapper: blockVolumeMapper,
762762
outerVolumeSpecName: outerVolumeSpecName,
763-
volumeGidValue: volumeGidValue,
763+
volumeGIDValue: volumeGIDValue,
764764
volumeSpec: volumeSpec,
765765
volumeMountStateForPod: markVolumeOpts.VolumeMountState,
766766
seLinuxMountContext: markVolumeOpts.SELinuxMountContext,
@@ -1311,7 +1311,7 @@ func getMountedVolume(
13111311
PodUID: mountedPod.podUID,
13121312
Mounter: mountedPod.mounter,
13131313
BlockVolumeMapper: mountedPod.blockVolumeMapper,
1314-
VolumeGidValue: mountedPod.volumeGidValue,
1314+
VolumeGIDValue: mountedPod.volumeGIDValue,
13151315
VolumeSpec: mountedPod.volumeSpec,
13161316
DeviceMountPath: attachedVolume.deviceMountPath,
13171317
SELinuxMountContext: seLinuxMountContext}}

‎pkg/kubelet/volumemanager/cache/desired_state_of_world.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ type DesiredStateOfWorld interface {
6161
// added.
6262
// If a pod with the same unique name already exists under the specified
6363
// volume, this is a no-op.
64-
AddPodToVolume(podName types.UniquePodName, pod *v1.Pod, volumeSpec *volume.Spec, outerVolumeSpecName string, volumeGidValue string, seLinuxContainerContexts []*v1.SELinuxOptions) (v1.UniqueVolumeName, error)
64+
AddPodToVolume(podName types.UniquePodName, pod *v1.Pod, volumeSpec *volume.Spec, outerVolumeSpecName string, volumeGIDValue string, seLinuxContainerContexts []*v1.SELinuxOptions) (v1.UniqueVolumeName, error)
6565

6666
// MarkVolumesReportedInUse sets the ReportedInUse value to true for the
6767
// reportedVolumes. For volumes not in the reportedVolumes list, the
@@ -193,8 +193,8 @@ type volumeToMount struct {
193193
// the volume.DeviceMounter interface
194194
pluginIsDeviceMountable bool
195195

196-
// volumeGidValue contains the value of the GID annotation, if present.
197-
volumeGidValue string
196+
// volumeGIDValue contains the value of the GID annotation, if present.
197+
volumeGIDValue string
198198

199199
// reportedInUse indicates that the volume was successfully added to the
200200
// VolumesInUse field in the node's status.
@@ -262,7 +262,7 @@ func (dsw *desiredStateOfWorld) AddPodToVolume(
262262
pod *v1.Pod,
263263
volumeSpec *volume.Spec,
264264
outerVolumeSpecName string,
265-
volumeGidValue string,
265+
volumeGIDValue string,
266266
seLinuxContainerContexts []*v1.SELinuxOptions) (v1.UniqueVolumeName, error) {
267267
dsw.Lock()
268268
defer dsw.Unlock()
@@ -336,7 +336,7 @@ func (dsw *desiredStateOfWorld) AddPodToVolume(
336336
podsToMount: make(map[types.UniquePodName]podToMount),
337337
pluginIsAttachable: attachable,
338338
pluginIsDeviceMountable: deviceMountable,
339-
volumeGidValue: volumeGidValue,
339+
volumeGIDValue: volumeGIDValue,
340340
reportedInUse: false,
341341
desiredSizeLimit: sizeLimit,
342342
effectiveSELinuxMountFileLabel: effectiveSELinuxMountLabel,
@@ -606,7 +606,7 @@ func (dsw *desiredStateOfWorld) GetVolumesToMount() []VolumeToMount {
606606
PluginIsAttachable: volumeObj.pluginIsAttachable,
607607
PluginIsDeviceMountable: volumeObj.pluginIsDeviceMountable,
608608
OuterVolumeSpecName: podObj.outerVolumeSpecName,
609-
VolumeGidValue: volumeObj.volumeGidValue,
609+
VolumeGIDValue: volumeObj.volumeGIDValue,
610610
ReportedInUse: volumeObj.reportedInUse,
611611
MountRequestTime: podObj.mountRequestTime,
612612
DesiredSizeLimit: volumeObj.desiredSizeLimit,

‎pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func Test_AddPodToVolume_Positive_NewPodNewVolume(t *testing.T) {
6565

6666
// Act
6767
generatedVolumeName, err := dsw.AddPodToVolume(
68-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxContainerContexts */)
68+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxContainerContexts */)
6969

7070
// Assert
7171
if err != nil {
@@ -111,7 +111,7 @@ func Test_AddPodToVolume_Positive_ExistingPodExistingVolume(t *testing.T) {
111111

112112
// Act
113113
generatedVolumeName, err := dsw.AddPodToVolume(
114-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxContainerContexts */)
114+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxContainerContexts */)
115115

116116
// Assert
117117
if err != nil {
@@ -318,7 +318,7 @@ func Test_DeletePodFromVolume_Positive_PodExistsVolumeExists(t *testing.T) {
318318
volumeSpec := &volume.Spec{Volume: &pod.Spec.Volumes[0]}
319319
podName := util.GetUniquePodName(pod)
320320
generatedVolumeName, err := dsw.AddPodToVolume(
321-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxContainerContexts */)
321+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxContainerContexts */)
322322
if err != nil {
323323
t.Fatalf("AddPodToVolume failed. Expected: <no error> Actual: <%v>", err)
324324
}
@@ -417,19 +417,19 @@ func Test_MarkVolumesReportedInUse_Positive_NewPodNewVolume(t *testing.T) {
417417
pod3Name := util.GetUniquePodName(pod3)
418418

419419
generatedVolume1Name, err := dsw.AddPodToVolume(
420-
pod1Name, pod1, volume1Spec, volume1Spec.Name(), "" /* volumeGidValue */, nil /* seLinuxContainerContexts */)
420+
pod1Name, pod1, volume1Spec, volume1Spec.Name(), "" /* volumeGIDValue */, nil /* seLinuxContainerContexts */)
421421
if err != nil {
422422
t.Fatalf("AddPodToVolume failed. Expected: <no error> Actual: <%v>", err)
423423
}
424424

425425
generatedVolume2Name, err := dsw.AddPodToVolume(
426-
pod2Name, pod2, volume2Spec, volume2Spec.Name(), "" /* volumeGidValue */, nil /* seLinuxContainerContexts */)
426+
pod2Name, pod2, volume2Spec, volume2Spec.Name(), "" /* volumeGIDValue */, nil /* seLinuxContainerContexts */)
427427
if err != nil {
428428
t.Fatalf("AddPodToVolume failed. Expected: <no error> Actual: <%v>", err)
429429
}
430430

431431
generatedVolume3Name, err := dsw.AddPodToVolume(
432-
pod3Name, pod3, volume3Spec, volume3Spec.Name(), "" /* volumeGidValue */, nil /* seLinuxContainerContexts */)
432+
pod3Name, pod3, volume3Spec, volume3Spec.Name(), "" /* volumeGIDValue */, nil /* seLinuxContainerContexts */)
433433
if err != nil {
434434
t.Fatalf("AddPodToVolume failed. Expected: <no error> Actual: <%v>", err)
435435
}
@@ -865,7 +865,7 @@ func Test_AddPodToVolume_SELinuxSinglePod(t *testing.T) {
865865

866866
// Act
867867
generatedVolumeName, err := dsw.AddPodToVolume(
868-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, seLinuxContainerContexts)
868+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, seLinuxContainerContexts)
869869

870870
// Assert
871871
if tc.expectError {
@@ -1214,7 +1214,7 @@ func Test_AddPodToVolume_SELinux_MultiplePods(t *testing.T) {
12141214

12151215
// Act
12161216
generatedVolumeName, err := dsw.AddPodToVolume(
1217-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, seLinuxContainerContexts)
1217+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, seLinuxContainerContexts)
12181218

12191219
// Assert
12201220
if err != nil {
@@ -1238,7 +1238,7 @@ func Test_AddPodToVolume_SELinux_MultiplePods(t *testing.T) {
12381238

12391239
// Act
12401240
generatedVolumeName2, err := dsw.AddPodToVolume(
1241-
pod2Name, pod2, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, seLinuxContainerContexts)
1241+
pod2Name, pod2, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, seLinuxContainerContexts)
12421242
// Assert
12431243
if tc.expectError {
12441244
if err == nil {

‎pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ func (dswp *desiredStateOfWorldPopulator) processPodVolumes(
312312
continue
313313
}
314314

315-
pvc, volumeSpec, volumeGidValue, err :=
315+
pvc, volumeSpec, volumeGIDValue, err :=
316316
dswp.createVolumeSpec(logger, podVolume, pod, mounts, devices)
317317
if err != nil {
318318
logger.Error(err, "Error processing volume", "pod", klog.KObj(pod), "volumeName", podVolume.Name)
@@ -323,7 +323,7 @@ func (dswp *desiredStateOfWorldPopulator) processPodVolumes(
323323

324324
// Add volume to desired state of world
325325
_, err = dswp.desiredStateOfWorld.AddPodToVolume(
326-
uniquePodName, pod, volumeSpec, podVolume.Name, volumeGidValue, seLinuxContainerContexts[podVolume.Name])
326+
uniquePodName, pod, volumeSpec, podVolume.Name, volumeGIDValue, seLinuxContainerContexts[podVolume.Name])
327327
if err != nil {
328328
logger.Error(err, "Failed to add volume to desiredStateOfWorld", "pod", klog.KObj(pod), "volumeName", podVolume.Name, "volumeSpecName", volumeSpec.Name())
329329
dswp.desiredStateOfWorld.AddErrorToPod(uniquePodName, err.Error())
@@ -494,7 +494,7 @@ func (dswp *desiredStateOfWorldPopulator) createVolumeSpec(
494494
pvName, pvcUID := pvc.Spec.VolumeName, pvc.UID
495495
logger.V(5).Info("Found bound PV for PVC", "PVC", klog.KRef(pod.Namespace, pvcSource.ClaimName), "PVCUID", pvcUID, "PVName", pvName)
496496
// Fetch actual PV object
497-
volumeSpec, volumeGidValue, err :=
497+
volumeSpec, volumeGIDValue, err :=
498498
dswp.getPVSpec(pvName, pvcSource.ReadOnly, pvcUID)
499499
if err != nil {
500500
return nil, nil, "", fmt.Errorf(
@@ -533,7 +533,7 @@ func (dswp *desiredStateOfWorldPopulator) createVolumeSpec(
533533
podVolume.Name,
534534
volumeMode)
535535
}
536-
return pvc, volumeSpec, volumeGidValue, nil
536+
return pvc, volumeSpec, volumeGIDValue, nil
537537
}
538538

539539
// Do not return the original volume object, since the source could mutate it
@@ -614,8 +614,8 @@ func (dswp *desiredStateOfWorldPopulator) getPVSpec(
614614
expectedClaimUID)
615615
}
616616

617-
volumeGidValue := getPVVolumeGidAnnotationValue(pv)
618-
return volume.NewSpecFromPersistentVolume(pv, pvcReadOnly), volumeGidValue, nil
617+
volumeGIDValue := getPVVolumeGidAnnotationValue(pv)
618+
return volume.NewSpecFromPersistentVolume(pv, pvcReadOnly), volumeGIDValue, nil
619619
}
620620

621621
func getPVVolumeGidAnnotationValue(pv *v1.PersistentVolume) string {

‎pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ func TestFindAndRemoveDeletedPodsWithUncertain(t *testing.T) {
406406
PodUID: pod.UID,
407407
VolumeName: expectedVolumeName,
408408
OuterVolumeSpecName: "dswp-test-volume-name",
409-
VolumeGidVolume: "",
409+
VolumeGIDVolume: "",
410410
VolumeSpec: volume.NewSpecFromPersistentVolume(pv, false),
411411
VolumeMountState: operationexecutor.VolumeMountUncertain,
412412
}
@@ -1392,7 +1392,7 @@ func reconcileASW(asw cache.ActualStateOfWorld, dsw cache.DesiredStateOfWorld, t
13921392
PodUID: volumeToMount.Pod.UID,
13931393
VolumeName: volumeToMount.VolumeName,
13941394
OuterVolumeSpecName: volumeToMount.OuterVolumeSpecName,
1395-
VolumeGidVolume: volumeToMount.VolumeGidValue,
1395+
VolumeGIDVolume: volumeToMount.VolumeGIDValue,
13961396
VolumeSpec: volumeToMount.VolumeSpec,
13971397
VolumeMountState: operationexecutor.VolumeMounted,
13981398
}

‎pkg/kubelet/volumemanager/reconciler/reconciler_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func Test_Run_Positive_VolumeAttachAndMount(t *testing.T) {
163163
volumeSpec := &volume.Spec{Volume: &pod.Spec.Volumes[0]}
164164
podName := util.GetUniquePodName(pod)
165165
generatedVolumeName, err := dsw.AddPodToVolume(
166-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
166+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
167167

168168
// Assert
169169
if err != nil {
@@ -269,7 +269,7 @@ func Test_Run_Positive_VolumeAttachAndMountMigrationEnabled(t *testing.T) {
269269
pod,
270270
migratedSpec,
271271
migratedSpec.Name(),
272-
"", /* volumeGidValue */
272+
"", /* volumeGIDValue */
273273
nil, /* SELinuxContexts */
274274
)
275275

@@ -361,7 +361,7 @@ func Test_Run_Positive_VolumeMountControllerAttachEnabled(t *testing.T) {
361361
volumeSpec := &volume.Spec{Volume: &pod.Spec.Volumes[0]}
362362
podName := util.GetUniquePodName(pod)
363363
generatedVolumeName, err := dsw.AddPodToVolume(
364-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
364+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
365365
dsw.MarkVolumesReportedInUse([]v1.UniqueVolumeName{generatedVolumeName})
366366

367367
// Assert
@@ -441,7 +441,7 @@ func Test_Run_Negative_VolumeMountControllerAttachEnabled(t *testing.T) {
441441
volumeSpec := &volume.Spec{Volume: &pod.Spec.Volumes[0]}
442442
podName := util.GetUniquePodName(pod)
443443
generatedVolumeName, err := dsw.AddPodToVolume(
444-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
444+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
445445

446446
// Assert
447447
if err != nil {
@@ -520,7 +520,7 @@ func Test_Run_Positive_VolumeAttachMountUnmountDetach(t *testing.T) {
520520
volumeSpec := &volume.Spec{Volume: &pod.Spec.Volumes[0]}
521521
podName := util.GetUniquePodName(pod)
522522
generatedVolumeName, err := dsw.AddPodToVolume(
523-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
523+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
524524

525525
// Assert
526526
if err != nil {
@@ -623,7 +623,7 @@ func Test_Run_Positive_VolumeUnmountControllerAttachEnabled(t *testing.T) {
623623
volumeSpec := &volume.Spec{Volume: &pod.Spec.Volumes[0]}
624624
podName := util.GetUniquePodName(pod)
625625
generatedVolumeName, err := dsw.AddPodToVolume(
626-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
626+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
627627

628628
// Assert
629629
if err != nil {
@@ -731,7 +731,7 @@ func Test_Run_Positive_VolumeAttachAndMap(t *testing.T) {
731731
}
732732
podName := util.GetUniquePodName(pod)
733733
generatedVolumeName, err := dsw.AddPodToVolume(
734-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
734+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
735735

736736
// Assert
737737
if err != nil {
@@ -844,7 +844,7 @@ func Test_Run_Positive_BlockVolumeMapControllerAttachEnabled(t *testing.T) {
844844

845845
podName := util.GetUniquePodName(pod)
846846
generatedVolumeName, err := dsw.AddPodToVolume(
847-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
847+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
848848
dsw.MarkVolumesReportedInUse([]v1.UniqueVolumeName{generatedVolumeName})
849849

850850
// Assert
@@ -942,7 +942,7 @@ func Test_Run_Positive_BlockVolumeAttachMapUnmapDetach(t *testing.T) {
942942

943943
podName := util.GetUniquePodName(pod)
944944
generatedVolumeName, err := dsw.AddPodToVolume(
945-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
945+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
946946

947947
// Assert
948948
if err != nil {
@@ -1067,7 +1067,7 @@ func Test_Run_Positive_VolumeUnmapControllerAttachEnabled(t *testing.T) {
10671067

10681068
podName := util.GetUniquePodName(pod)
10691069
generatedVolumeName, err := dsw.AddPodToVolume(
1070-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
1070+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
10711071

10721072
// Assert
10731073
if err != nil {
@@ -1349,7 +1349,7 @@ func Test_Run_Positive_VolumeFSResizeControllerAttachEnabled(t *testing.T) {
13491349
volumeSpec := &volume.Spec{PersistentVolume: pv}
13501350
podName := util.GetUniquePodName(pod)
13511351
volumeName, err := dsw.AddPodToVolume(
1352-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
1352+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
13531353
// Assert
13541354
if err != nil {
13551355
t.Fatalf("AddPodToVolume failed. Expected: <no error> Actual: <%v>", err)
@@ -1370,7 +1370,7 @@ func Test_Run_Positive_VolumeFSResizeControllerAttachEnabled(t *testing.T) {
13701370
// Simulate what DSOWP does
13711371
pvWithSize.Spec.Capacity[v1.ResourceStorage] = tc.newPVSize
13721372
volumeSpec = &volume.Spec{PersistentVolume: pvWithSize}
1373-
dsw.AddPodToVolume(podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxContexts */)
1373+
dsw.AddPodToVolume(podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxContexts */)
13741374

13751375
t.Logf("Changing size of the volume to %s", tc.newPVSize.String())
13761376
newSize := tc.newPVSize.DeepCopy()
@@ -1604,7 +1604,7 @@ func Test_UncertainDeviceGlobalMounts(t *testing.T) {
16041604
volumeSpec := &volume.Spec{PersistentVolume: pv}
16051605
podName := util.GetUniquePodName(pod)
16061606
volumeName, err := dsw.AddPodToVolume(
1607-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
1607+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
16081608
// Assert
16091609
if err != nil {
16101610
t.Fatalf("AddPodToVolume failed. Expected: <no error> Actual: <%v>", err)
@@ -1827,7 +1827,7 @@ func Test_UncertainVolumeMountState(t *testing.T) {
18271827
volumeSpec := &volume.Spec{PersistentVolume: pv}
18281828
podName := util.GetUniquePodName(pod)
18291829
volumeName, err := dsw.AddPodToVolume(
1830-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
1830+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
18311831
// Assert
18321832
if err != nil {
18331833
t.Fatalf("AddPodToVolume failed. Expected: <no error> Actual: <%v>", err)
@@ -2166,7 +2166,7 @@ func Test_Run_Positive_VolumeMountControllerAttachEnabledRace(t *testing.T) {
21662166
volumeSpecCopy := &volume.Spec{Volume: &pod.Spec.Volumes[0]}
21672167
podName := util.GetUniquePodName(pod)
21682168
generatedVolumeName, err := dsw.AddPodToVolume(
2169-
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
2169+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
21702170
dsw.MarkVolumesReportedInUse([]v1.UniqueVolumeName{generatedVolumeName})
21712171

21722172
if err != nil {
@@ -2193,7 +2193,7 @@ func Test_Run_Positive_VolumeMountControllerAttachEnabledRace(t *testing.T) {
21932193
klog.InfoS("UnmountDevice called")
21942194
var generatedVolumeNameCopy v1.UniqueVolumeName
21952195
generatedVolumeNameCopy, err = dsw.AddPodToVolume(
2196-
podName, pod, volumeSpecCopy, volumeSpec.Name(), "" /* volumeGidValue */, nil /* seLinuxLabel */)
2196+
podName, pod, volumeSpecCopy, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxLabel */)
21972197
dsw.MarkVolumesReportedInUse([]v1.UniqueVolumeName{generatedVolumeNameCopy})
21982198
return nil
21992199
}

‎pkg/kubelet/volumemanager/reconciler/reconstruct.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (rc *reconciler) updateStates(reconstructedVolumes map[v1.UniqueVolumeName]
115115
Mounter: volume.mounter,
116116
BlockVolumeMapper: volume.blockVolumeMapper,
117117
OuterVolumeSpecName: volume.outerVolumeSpecName,
118-
VolumeGidVolume: volume.volumeGidValue,
118+
VolumeGIDVolume: volume.volumeGIDValue,
119119
VolumeSpec: volume.volumeSpec,
120120
VolumeMountState: operationexecutor.VolumeMountUncertain,
121121
SELinuxMountContext: volume.seLinuxMountContext,

0 commit comments

Comments
 (0)