diff options
| author | Brent Baude <bbaude@redhat.com> | 2021-10-12 12:35:55 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-10-19 15:56:35 -0400 |
| commit | 3082ba8b7b4489ec0be3886450b2681e16aca17e (patch) | |
| tree | 2189fc2664f96219c3897a97d428e7f0e9b18bb3 /libpod | |
| parent | b470de05b072fff1d7a70459a0d4543d0dbc9b0a (diff) | |
| download | podman-3082ba8b7b4489ec0be3886450b2681e16aca17e.tar.gz podman-3082ba8b7b4489ec0be3886450b2681e16aca17e.tar.bz2 podman-3082ba8b7b4489ec0be3886450b2681e16aca17e.zip | |
No space in kube annotations for bind mounts
Kubernetes fails to deal with an annotation that has a space in it.
Trim these strings to remove spaces.
Fixes: #11929
Signed-off-by: Brent Baude <bbaude@redhat.com>
[NO TESTS NEEDED]
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/kube.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/kube.go b/libpod/kube.go index cb97eb5ab..9e1e3ddfe 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) |