aboutsummaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-05-06 09:27:17 -0400
committerGitHub <noreply@github.com>2022-05-06 09:27:17 -0400
commitf40474521b577153e960ea1dd9601b67307aeede (patch)
treeffd7d17ec55125c13fbce511fdc0a404f45e2555 /pkg/api
parent83ef2c721ad438256b136b3491e504a6e70b64c9 (diff)
parentab4d33e146eab7cd685bb266e38ca62782642036 (diff)
downloadpodman-f40474521b577153e960ea1dd9601b67307aeede.tar.gz
podman-f40474521b577153e960ea1dd9601b67307aeede.tar.bz2
podman-f40474521b577153e960ea1dd9601b67307aeede.zip
Merge pull request #14132 from mheon/bump_410
Bump to v4.1.0
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/handlers/libpod/play.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkg/api/handlers/libpod/play.go b/pkg/api/handlers/libpod/play.go
index ca9ada761..b71afc28c 100644
--- a/pkg/api/handlers/libpod/play.go
+++ b/pkg/api/handlers/libpod/play.go
@@ -70,6 +70,16 @@ func PlayKube(w http.ResponseWriter, r *http.Request) {
password = authConf.Password
}
+ logDriver := query.LogDriver
+ if logDriver == "" {
+ config, err := runtime.GetConfig()
+ if err != nil {
+ utils.Error(w, http.StatusInternalServerError, err)
+ return
+ }
+ query.LogDriver = config.Containers.LogDriver
+ }
+
containerEngine := abi.ContainerEngine{Libpod: runtime}
options := entities.PlayKubeOptions{
Annotations: query.Annotations,