opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-03 01:37:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11943 from baude/issue11929

Browse Source 
No space in kube annotations for bind mounts
This commit is contained in:
OpenShift Merge Robot
2021-10-13 10:01:58 +02:00
committed by GitHub
parent 72e87c0ca8 ab0e6630f5
commit 0b8673d0e7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/kube.go
View File

@ -246,7 +246,7 @@ func (p *Pod) podWithContainers(ctx context.Context, containers []*Container, po
return nil, err return nil, err
} }
for k, v := range annotations { 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 // Since port bindings for the pod are handled by the
// infra container, wipe them here. // infra container, wipe them here.
@ -366,7 +366,7 @@ func simplePodWithV1Containers(ctx context.Context, ctrs []*Container) (*v1.Pod,
return nil, err return nil, err
} }
for k, v := range annotations { for k, v := range annotations {
kubeAnnotations[define.BindMountPrefix+k] = v kubeAnnotations[define.BindMountPrefix+k] = strings.TrimSpace(v)
} }
if isInit { if isInit {
kubeInitCtrs = append(kubeInitCtrs, kubeCtr) kubeInitCtrs = append(kubeInitCtrs, kubeCtr)