aboutsummaryrefslogtreecommitdiff
path: root/pkg/domain/infra
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-09 10:12:22 -0400
committerGitHub <noreply@github.com>2021-09-09 10:12:22 -0400
commitd477fe5caeaa9205ccc0a1f70dd46ea4dbe8a1ba (patch)
tree388baefdc58522896f1674b6a96dbf3ae4b65207 /pkg/domain/infra
parent7ee5b29b0701ea5279329a0a699ad0f96cfe22aa (diff)
parenta1cab358cc861862baab760120d8d91a937c46f2 (diff)
downloadpodman-d477fe5caeaa9205ccc0a1f70dd46ea4dbe8a1ba.tar.gz
podman-d477fe5caeaa9205ccc0a1f70dd46ea4dbe8a1ba.tar.bz2
podman-d477fe5caeaa9205ccc0a1f70dd46ea4dbe8a1ba.zip
Merge pull request #11447 from chenzhiwei/respect-config
fix play kube can't use infra_image in config file
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r--pkg/domain/infra/abi/play.go7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index c9a6930f7..c6d5dcc3d 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -269,12 +269,9 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
}
if podOpt.Infra {
- imagePull := config.DefaultInfraImage
- if podOpt.InfraImage != config.DefaultInfraImage && podOpt.InfraImage != "" {
- imagePull = podOpt.InfraImage
- }
+ containerConfig := util.DefaultContainerConfig()
- pulledImages, err := pullImage(ic, writer, imagePull, options, config.PullPolicyNewer)
+ pulledImages, err := pullImage(ic, writer, containerConfig.Engine.InfraImage, options, config.PullPolicyNewer)
if err != nil {
return nil, err
}