diff options
author | Aditya R <arajan@redhat.com> | 2022-03-31 14:46:50 +0530 |
---|---|---|
committer | Aditya R <arajan@redhat.com> | 2022-03-31 15:07:22 +0530 |
commit | daeea48df5061d1d7a7207995fa166c2106ba3ae (patch) | |
tree | dc654d918cd0fb947670f44769a57e0faac62fed /pkg | |
parent | c08e8c30a1069acab69bd5704c6362c7c90252d6 (diff) | |
download | podman-daeea48df5061d1d7a7207995fa166c2106ba3ae.tar.gz podman-daeea48df5061d1d7a7207995fa166c2106ba3ae.tar.bz2 podman-daeea48df5061d1d7a7207995fa166c2106ba3ae.zip |
kube: configmap volume should be reused if already exists
`podman play kube` creates a new volume for configmap, if same configmap
is applied again volume can be re-used, there is no need to remove and
re-create the volume again
Signed-off-by: Aditya R <arajan@redhat.com>
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/domain/infra/abi/play.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 1423ab06e..c3f6bb17d 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -290,7 +290,16 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY if v.Type == kube.KubeVolumeTypeConfigMap && !v.Optional { vol, err := ic.Libpod.NewVolume(ctx, libpod.WithVolumeName(v.Source)) if err != nil { - return nil, errors.Wrapf(err, "cannot create a local volume for volume from configmap %q", v.Source) + if errors.Is(err, define.ErrVolumeExists) { + // Volume for this configmap already exists do not + // error out instead reuse the current volume. + vol, err = ic.Libpod.GetVolume(v.Source) + if err != nil { + return nil, errors.Wrapf(err, "cannot re-use local volume for volume from configmap %q", v.Source) + } + } else { + return nil, errors.Wrapf(err, "cannot create a local volume for volume from configmap %q", v.Source) + } } mountPoint, err := vol.MountPoint() if err != nil || mountPoint == "" { |