diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-27 06:08:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 06:08:22 -0400 |
| commit | 5baa0ae85e5e6f0c3a35f7043b298f39f80aafc1 (patch) | |
| tree | d8683d9bd1268f52dbd6e1a8115b17ca134baada /libpod | |
| parent | e6fc34b71aa9d876b1218efe90e14f8b912b0603 (diff) | |
| parent | 3bf0fbf6f6159107c0a2a120ee9f381675af53c0 (diff) | |
| download | podman-5baa0ae85e5e6f0c3a35f7043b298f39f80aafc1.tar.gz podman-5baa0ae85e5e6f0c3a35f7043b298f39f80aafc1.tar.bz2 podman-5baa0ae85e5e6f0c3a35f7043b298f39f80aafc1.zip | |
Merge pull request #10136 from zhangguanzhang/generate-kube-volume
Fixes generate kube incorrect when bind-mounting "/" and "/root"
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/kube.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libpod/kube.go b/libpod/kube.go index 11ccaeadc..adcfe92c9 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -1,6 +1,7 @@ package libpod import ( + "fmt" "math/rand" "os" "strconv" @@ -539,11 +540,17 @@ func libpodMountsToKubeVolumeMounts(c *Container) ([]v1.VolumeMount, []v1.Volume namedVolumes, mounts := c.sortUserVolumes(c.config.Spec) vms := make([]v1.VolumeMount, 0, len(mounts)) vos := make([]v1.Volume, 0, len(mounts)) - for _, m := range mounts { + + var suffix string + for index, m := range mounts { vm, vo, err := generateKubeVolumeMount(m) if err != nil { return vms, vos, err } + // Name will be the same, so use the index as suffix + suffix = fmt.Sprintf("-%d", index) + vm.Name += suffix + vo.Name += suffix vms = append(vms, vm) vos = append(vos, vo) } |