containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sort kube options alphabetically 

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2023-10-27 07:22:32 -04:00
parent dfa7e37763
commit 3ce62d3cc4
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/api/handlers/libpod/kube.go
View File

@ -20,19 +20,19 @@ func KubePlay(w http.ResponseWriter, r *http.Request) {
decoder := r.Context().Value(api.DecoderKey).(*schema.Decoder) decoder := r.Context().Value(api.DecoderKey).(*schema.Decoder)
query := struct { query := struct {
Annotations map[string]string `schema:"annotations"` Annotations map[string]string `schema:"annotations"`
Network []string `schema:"network"`
TLSVerify bool `schema:"tlsVerify"`
LogDriver string `schema:"logDriver"` LogDriver string `schema:"logDriver"`
LogOptions []string `schema:"logOptions"` LogOptions []string `schema:"logOptions"`
Network []string `schema:"network"`
NoHosts bool `schema:"noHosts"`
NoTrunc bool `schema:"noTrunc"`
PublishPorts []string `schema:"publishPorts"`
ServiceContainer bool `schema:"serviceContainer"`
Start bool `schema:"start"` Start bool `schema:"start"`
StaticIPs []string `schema:"staticIPs"` StaticIPs []string `schema:"staticIPs"`
StaticMACs []string `schema:"staticMACs"` StaticMACs []string `schema:"staticMACs"`
NoHosts bool `schema:"noHosts"` TLSVerify bool `schema:"tlsVerify"`
Userns string `schema:"userns"` Userns string `schema:"userns"`
PublishPorts []string `schema:"publishPorts"`
NoTrunc bool `schema:"noTrunc"`
Wait bool `schema:"wait"` Wait bool `schema:"wait"`
ServiceContainer bool `schema:"serviceContainer"`
}{ }{
TLSVerify: true, TLSVerify: true,
Start: true, Start: true,
@ -89,21 +89,21 @@ func KubePlay(w http.ResponseWriter, r *http.Request) {
options := entities.PlayKubeOptions{ options := entities.PlayKubeOptions{
Annotations: query.Annotations, Annotations: query.Annotations,
Authfile: authfile, Authfile: authfile,
Username: username, IsRemote: true,
Password: password,
Networks: query.Network,
NoHosts: query.NoHosts,
Quiet: true,
LogDriver: logDriver, LogDriver: logDriver,
LogOptions: query.LogOptions, LogOptions: query.LogOptions,
Networks: query.Network,
NoHosts: query.NoHosts,
Password: password,
PublishPorts: query.PublishPorts,
Quiet: true,
ServiceContainer: query.ServiceContainer,
StaticIPs: staticIPs, StaticIPs: staticIPs,
StaticMACs: staticMACs, StaticMACs: staticMACs,
IsRemote: true,
Userns: query.Userns,
PublishPorts: query.PublishPorts,
Wait: query.Wait,
ServiceContainer: query.ServiceContainer,
UseLongAnnotations: query.NoTrunc, UseLongAnnotations: query.NoTrunc,
Username: username,
Userns: query.Userns,
Wait: query.Wait,
} }
if _, found := r.URL.Query()["tlsVerify"]; found { if _, found := r.URL.Query()["tlsVerify"]; found {
options.SkipTLSVerify = types.NewOptionalBool(!query.TLSVerify) options.SkipTLSVerify = types.NewOptionalBool(!query.TLSVerify)