summaryrefslogtreecommitdiff
path: root/pkg/domain/infra
diff options
context:
space:
mode:
authorChen Zhiwei <zhiweik@gmail.com>2021-09-04 03:33:20 -0400
committerChen Zhiwei <zhiweik@gmail.com>2021-09-08 19:55:45 +0800
commita1cab358cc861862baab760120d8d91a937c46f2 (patch)
treefaca8e79f8a9805ebdd98e12986736759fac03d4 /pkg/domain/infra
parente095667ac8c2ccaf06dea6d4c61f51d93b736968 (diff)
downloadpodman-a1cab358cc861862baab760120d8d91a937c46f2.tar.gz
podman-a1cab358cc861862baab760120d8d91a937c46f2.tar.bz2
podman-a1cab358cc861862baab760120d8d91a937c46f2.zip
fix play kube can't use infra_image in config file
Signed-off-by: Chen Zhiwei <zhiweik@gmail.com>
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 2799df794..115a62d6b 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -267,12 +267,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
}