From e59f261c12a60f96a51935eb23a2f62bae246eda Mon Sep 17 00:00:00 2001 From: David Zhu Date: Mon, 4 Mar 2019 17:26:01 -0800 Subject: [PATCH] Fix partition for 0 partitions defaulting --- .../src/k8s.io/csi-translation-lib/plugins/gce_pd.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/csi-translation-lib/plugins/gce_pd.go b/staging/src/k8s.io/csi-translation-lib/plugins/gce_pd.go index ddf73ff137..390ebde19a 100644 --- a/staging/src/k8s.io/csi-translation-lib/plugins/gce_pd.go +++ b/staging/src/k8s.io/csi-translation-lib/plugins/gce_pd.go @@ -87,13 +87,19 @@ func (g *gcePersistentDiskCSITranslator) TranslateInTreePVToCSI(pv *v1.Persisten } gceSource := pv.Spec.PersistentVolumeSource.GCEPersistentDisk + + partition := "" + if gceSource.Partition != 0 { + partition = strconv.Itoa(int(gceSource.Partition)) + } + csiSource := &v1.CSIPersistentVolumeSource{ Driver: GCEPDDriverName, VolumeHandle: volID, ReadOnly: gceSource.ReadOnly, FSType: gceSource.FSType, VolumeAttributes: map[string]string{ - "partition": strconv.FormatInt(int64(gceSource.Partition), 10), + "partition": partition, }, } @@ -121,7 +127,7 @@ func (g *gcePersistentDiskCSITranslator) TranslateCSIPVToInTree(pv *v1.Persisten FSType: csiSource.FSType, ReadOnly: csiSource.ReadOnly, } - if partition, ok := csiSource.VolumeAttributes["partition"]; ok { + if partition, ok := csiSource.VolumeAttributes["partition"]; ok && partition != "" { partInt, err := strconv.Atoi(partition) if err != nil { return nil, fmt.Errorf("Failed to convert partition %v to integer: %v", partition, err)