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

If API calls for kube play --replace, then replace pod

Browse Source 
Currently if user specifies podman kube play --replace, the
pod is removed on the client side, not the server side.  If
the API is called with replace=true, the pod was not being removed
and this called the API to fail. This PR removes the pod if it
exists and the caller specifies replace=true.

Fixes: https://github.com/containers/podman/discussions/20705

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2023-11-22 07:27:43 -05:00
parent 2f160f850f
commit 75638a72a8
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/domain/infra/abi/play.go
View File

@ -714,6 +714,11 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
podSpec.PodSpecGen.ServiceContainerID = serviceContainer.ID() podSpec.PodSpecGen.ServiceContainerID = serviceContainer.ID()
} }
if options.Replace {
if _, err := ic.PodRm(ctx, []string{podName}, entities.PodRmOptions{Force: true, Ignore: true}); err != nil {
return nil, nil, fmt.Errorf("replacing pod %v: %w", podName, err)
}
}
// Create the Pod // Create the Pod
pod, err := generate.MakePod(&podSpec, ic.Libpod) pod, err := generate.MakePod(&podSpec, ic.Libpod)
if err != nil { if err != nil {

7
test/apiv2/80-kube.at
View File

@ -48,6 +48,13 @@ t POST libpod/kube/play $YAML 200 \
.Pods[0].ContainerErrors=null \ .Pods[0].ContainerErrors=null \
.Pods[0].Containers[0]~[0-9a-f]\\{64\\} .Pods[0].Containers[0]~[0-9a-f]\\{64\\}
t POST libpod/kube/play $YAML 500
t POST 'libpod/kube/play?replace=true' $YAML 200 \
.Pods[0].ID~[0-9a-f]\\{64\\} \
.Pods[0].ContainerErrors=null \
.Pods[0].Containers[0]~[0-9a-f]\\{64\\}
t DELETE libpod/kube/play $YAML 200 \ t DELETE libpod/kube/play $YAML 200 \
.StopReport[0].Id~[0-9a-f]\\{64\\} \ .StopReport[0].Id~[0-9a-f]\\{64\\} \
.RmReport[0].Id~[0-9a-f]\\{64\\} .RmReport[0].Id~[0-9a-f]\\{64\\}