diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-10 12:29:19 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-10 12:29:19 +0000 |
commit | da95fb4226c82694af19610578d9c14a6aa964f2 (patch) | |
tree | 4619c8156df3d85b7d56ebc6e2c17dac1c829e19 /pkg/api | |
parent | c20970f2b4de458afb631d3afdae30bfa0f686e5 (diff) | |
parent | f3355d9697119a1fd44abea1981d5ab6337ab67a (diff) | |
download | podman-da95fb4226c82694af19610578d9c14a6aa964f2.tar.gz podman-da95fb4226c82694af19610578d9c14a6aa964f2.tar.bz2 podman-da95fb4226c82694af19610578d9c14a6aa964f2.zip |
Merge pull request #8270 from andylibrian/log-driver-option-for-play-kube
Add --log-driver to play kube
Diffstat (limited to 'pkg/api')
-rw-r--r-- | pkg/api/handlers/libpod/play.go | 12 | ||||
-rw-r--r-- | pkg/api/server/register_play.go | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pkg/api/handlers/libpod/play.go b/pkg/api/handlers/libpod/play.go index b81bc9d6b..0c7a6e19d 100644 --- a/pkg/api/handlers/libpod/play.go +++ b/pkg/api/handlers/libpod/play.go @@ -22,6 +22,7 @@ func PlayKube(w http.ResponseWriter, r *http.Request) { query := struct { Network string `schema:"reference"` TLSVerify bool `schema:"tlsVerify"` + LogDriver string `schema:"logDriver"` }{ TLSVerify: true, } @@ -62,11 +63,12 @@ func PlayKube(w http.ResponseWriter, r *http.Request) { containerEngine := abi.ContainerEngine{Libpod: runtime} options := entities.PlayKubeOptions{ - Authfile: authfile, - Username: username, - Password: password, - Network: query.Network, - Quiet: true, + Authfile: authfile, + Username: username, + Password: password, + Network: query.Network, + Quiet: true, + LogDriver: query.LogDriver, } if _, found := r.URL.Query()["tlsVerify"]; found { options.SkipTLSVerify = types.NewOptionalBool(!query.TLSVerify) diff --git a/pkg/api/server/register_play.go b/pkg/api/server/register_play.go index 9b27f36e4..e41f8311d 100644 --- a/pkg/api/server/register_play.go +++ b/pkg/api/server/register_play.go @@ -25,6 +25,10 @@ func (s *APIServer) registerPlayHandlers(r *mux.Router) error { // type: boolean // default: true // description: Require HTTPS and verify signatures when contacting registries. + // - in: query + // name: logDriver + // type: string + // description: Logging driver for the containers in the pod. // - in: body // name: request // description: Kubernetes YAML file. |