summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-10-13 10:01:58 +0200
committerGitHub <noreply@github.com>2021-10-13 10:01:58 +0200
commit0b8673d0e7c335e7edbaf5e4d0393ed409f08efe (patch)
tree64dde15ad4fb9bc20f961d9c315b99ccce6cfc79
parent72e87c0ca89701e76148c192c98754af305f09d1 (diff)
parentab0e6630f526198cb1b13835830cf56016d8cd69 (diff)
downloadpodman-0b8673d0e7c335e7edbaf5e4d0393ed409f08efe.tar.gz
podman-0b8673d0e7c335e7edbaf5e4d0393ed409f08efe.tar.bz2
podman-0b8673d0e7c335e7edbaf5e4d0393ed409f08efe.zip
Merge pull request #11943 from baude/issue11929
No space in kube annotations for bind mounts
-rw-r--r--libpod/kube.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/kube.go b/libpod/kube.go
index 816fe9cc3..eb7743886 100644
--- a/libpod/kube.go
+++ b/libpod/kube.go
@@ -246,7 +246,7 @@ func (p *Pod) podWithContainers(ctx context.Context, containers []*Container, po
return nil, err
}
for k, v := range annotations {
- podAnnotations[define.BindMountPrefix+k] = v
+ podAnnotations[define.BindMountPrefix+k] = strings.TrimSpace(v)
}
// Since port bindings for the pod are handled by the
// infra container, wipe them here.
@@ -366,7 +366,7 @@ func simplePodWithV1Containers(ctx context.Context, ctrs []*Container) (*v1.Pod,
return nil, err
}
for k, v := range annotations {
- kubeAnnotations[define.BindMountPrefix+k] = v
+ kubeAnnotations[define.BindMountPrefix+k] = strings.TrimSpace(v)
}
if isInit {
kubeInitCtrs = append(kubeInitCtrs, kubeCtr)