opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a 'generate kube' bug on ctrs with named volumes

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon
2019-05-21 13:52:55 -04:00
parent 773b9ac9d0
commit 03824e04fd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libpod/kube.go
View File

@ -220,12 +220,12 @@ func containerToV1Container(c *Container) (v1.Container, error) {
return kubeContainer, err return kubeContainer, err
} }
kubeContainer.VolumeMounts = volumes kubeContainer.VolumeMounts = volumes
return kubeContainer, errors.Wrapf(ErrNotImplemented, "volume names") //return kubeContainer, errors.Wrapf(ErrNotImplemented, "volume names")
} }
envVariables, err := libpodEnvVarsToKubeEnvVars(c.config.Spec.Process.Env) envVariables, err := libpodEnvVarsToKubeEnvVars(c.config.Spec.Process.Env)
if err != nil { if err != nil {
return kubeContainer, nil return kubeContainer, err
} }
portmappings, err := c.PortMappings() portmappings, err := c.PortMappings()
@ -234,7 +234,7 @@ func containerToV1Container(c *Container) (v1.Container, error) {
} }
ports, err := ocicniPortMappingToContainerPort(portmappings) ports, err := ocicniPortMappingToContainerPort(portmappings)
if err != nil { if err != nil {
return kubeContainer, nil return kubeContainer, err
} }
containerCommands := c.Command() containerCommands := c.Command()
@ -345,7 +345,7 @@ func libpodMountsToKubeVolumeMounts(c *Container) ([]v1.VolumeMount, error) {
for _, hostSourcePath := range c.config.UserVolumes { for _, hostSourcePath := range c.config.UserVolumes {
vm, err := generateKubeVolumeMount(hostSourcePath, c.config.Spec.Mounts) vm, err := generateKubeVolumeMount(hostSourcePath, c.config.Spec.Mounts)
if err != nil { if err != nil {
return vms, err continue
} }
vms = append(vms, vm) vms = append(vms, vm)
} }