summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-05-04 11:44:06 -0400
committerGitHub <noreply@github.com>2022-05-04 11:44:06 -0400
commitb1e9ea38e5a680afb9294cb8a451311991d94765 (patch)
tree52479da236329c5a6dcda0a399f73711a44890f9 /pkg
parent534405caa90bfd1a7c95fa2c4922468be274c685 (diff)
parentccd576504e7fb578add8f5390fa8ceb41dd1d9d4 (diff)
downloadpodman-b1e9ea38e5a680afb9294cb8a451311991d94765.tar.gz
podman-b1e9ea38e5a680afb9294cb8a451311991d94765.tar.bz2
podman-b1e9ea38e5a680afb9294cb8a451311991d94765.zip
Merge pull request #14060 from nicrowe00/13781
play kube default log driver
Diffstat (limited to 'pkg')
-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,