From 82c2266f25830f83ad701adba6edb0f5ac5d5094 Mon Sep 17 00:00:00 2001 From: phantooom Date: Thu, 15 Apr 2021 20:51:51 +0800 Subject: [PATCH] chore: make csi getPodInfoAttrs func private --- pkg/volume/csi/csi_block.go | 2 +- pkg/volume/csi/csi_mounter.go | 2 +- pkg/volume/csi/csi_util.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/volume/csi/csi_block.go b/pkg/volume/csi/csi_block.go index 1b595b70c67..cfda3e69f8a 100644 --- a/pkg/volume/csi/csi_block.go +++ b/pkg/volume/csi/csi_block.go @@ -222,7 +222,7 @@ func (m *csiBlockMapper) publishVolumeForBlock( return "", errors.New(log("blockMapper.publishVolumeForBlock failed to get VolumeLifecycleMode: %v", err)) } if podInfoEnabled { - volAttribs = mergeMap(volAttribs, GetPodInfoAttrs(m.pod, volumeLifecycleMode)) + volAttribs = mergeMap(volAttribs, getPodInfoAttrs(m.pod, volumeLifecycleMode)) } nodePublishSecrets := map[string]string{} diff --git a/pkg/volume/csi/csi_mounter.go b/pkg/volume/csi/csi_mounter.go index 654133fe40e..f96e93ce512 100644 --- a/pkg/volume/csi/csi_mounter.go +++ b/pkg/volume/csi/csi_mounter.go @@ -225,7 +225,7 @@ func (c *csiMountMgr) SetUpAt(dir string, mounterArgs volume.MounterArgs) error return volumetypes.NewTransientOperationFailure(log("mounter.SetUpAt failed to assemble volume attributes: %v", err)) } if podInfoEnabled { - volAttribs = mergeMap(volAttribs, GetPodInfoAttrs(c.pod, c.volumeLifecycleMode)) + volAttribs = mergeMap(volAttribs, getPodInfoAttrs(c.pod, c.volumeLifecycleMode)) } // Inject pod service account token into volume attributes diff --git a/pkg/volume/csi/csi_util.go b/pkg/volume/csi/csi_util.go index 2f71ffd12b4..ad9098b4ef8 100644 --- a/pkg/volume/csi/csi_util.go +++ b/pkg/volume/csi/csi_util.go @@ -205,8 +205,8 @@ func createCSIOperationContext(volumeSpec *volume.Spec, timeout time.Duration) ( return context.WithTimeout(ctx, timeout) } -// GetPodInfoAttrs returns pod info for NodePublish -func GetPodInfoAttrs(pod *api.Pod, volumeMode storage.VolumeLifecycleMode) map[string]string { +// getPodInfoAttrs returns pod info for NodePublish +func getPodInfoAttrs(pod *api.Pod, volumeMode storage.VolumeLifecycleMode) map[string]string { attrs := map[string]string{ "csi.storage.k8s.io/pod.name": pod.Name, "csi.storage.k8s.io/pod.namespace": pod.Namespace,