diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-20 15:34:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 15:34:56 -0400 |
| commit | 4822cc8cabce33732cb210103aaa208f81102c5d (patch) | |
| tree | 366b14e2215e42ddbe7630be59b2e4bcde9b04b8 /cmd/podman/play/kube.go | |
| parent | 6961b9475dbcbc6112d9c6022ac264c923ce083d (diff) | |
| parent | 3d2ad0f97a35617f76f30d02bbfa8aa1a7c1f958 (diff) | |
| download | podman-4822cc8cabce33732cb210103aaa208f81102c5d.tar.gz podman-4822cc8cabce33732cb210103aaa208f81102c5d.tar.bz2 podman-4822cc8cabce33732cb210103aaa208f81102c5d.zip | |
Merge pull request #8042 from rhatdan/tlsverify
--tls-verify and --authfile should work for all remote commands
Diffstat (limited to 'cmd/podman/play/kube.go')
| -rw-r--r-- | cmd/podman/play/kube.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/play/kube.go b/cmd/podman/play/kube.go index 976d720ee..1235f75a8 100644 --- a/cmd/podman/play/kube.go +++ b/cmd/podman/play/kube.go @@ -54,10 +54,10 @@ func init() { flags.StringVar(&kubeOptions.CredentialsCLI, "creds", "", "`Credentials` (USERNAME:PASSWORD) to use for authenticating to a registry") flags.StringVar(&kubeOptions.Network, "network", "", "Connect pod to CNI network(s)") flags.BoolVarP(&kubeOptions.Quiet, "quiet", "q", false, "Suppress output information when pulling images") + flags.BoolVar(&kubeOptions.TLSVerifyCLI, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries") + flags.StringVar(&kubeOptions.Authfile, "authfile", auth.GetDefaultAuthFile(), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override") if !registry.IsRemote() { - flags.StringVar(&kubeOptions.Authfile, "authfile", auth.GetDefaultAuthFile(), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override") flags.StringVar(&kubeOptions.CertDir, "cert-dir", "", "`Pathname` of a directory containing TLS certificates and keys") - flags.BoolVar(&kubeOptions.TLSVerifyCLI, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries") flags.StringVar(&kubeOptions.SignaturePolicy, "signature-policy", "", "`Pathname` of signature policy file (not usually used)") flags.StringVar(&kubeOptions.SeccompProfileRoot, "seccomp-profile-root", defaultSeccompRoot, "Directory path for seccomp profiles") flags.StringSliceVar(&kubeOptions.ConfigMaps, "configmap", []string{}, "`Pathname` of a YAML file containing a kubernetes configmap") |