diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-06 18:45:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 18:45:25 +0200 |
| commit | e318b09b6800ddb013ddf3b9a2fb99ebc55bd920 (patch) | |
| tree | 8c43be5292fdf5d3c0686572b89a8e92e6e8fe25 /cmd/podman | |
| parent | 09f553cc8054a670cb2c333ee47de4311d325635 (diff) | |
| parent | 91dbdff77e159fb5377cd57733a05c72cbd94c97 (diff) | |
| download | podman-e318b09b6800ddb013ddf3b9a2fb99ebc55bd920.tar.gz podman-e318b09b6800ddb013ddf3b9a2fb99ebc55bd920.tar.bz2 podman-e318b09b6800ddb013ddf3b9a2fb99ebc55bd920.zip | |
Merge pull request #5620 from cfelder/play-kube-networking
Add support for specifying CNI networks in podman play kube
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/cliconfig/config.go | 1 | ||||
| -rw-r--r-- | cmd/podman/play_kube.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go index 99f389799..6d98aaf0e 100644 --- a/cmd/podman/cliconfig/config.go +++ b/cmd/podman/cliconfig/config.go @@ -321,6 +321,7 @@ type KubePlayValues struct { Authfile string CertDir string Creds string + Network string Quiet bool SignaturePolicy string TlsVerify bool diff --git a/cmd/podman/play_kube.go b/cmd/podman/play_kube.go index 2028d2ef4..a5669c595 100644 --- a/cmd/podman/play_kube.go +++ b/cmd/podman/play_kube.go @@ -51,6 +51,7 @@ func init() { flags.StringVar(&playKubeCommand.SeccompProfileRoot, "seccomp-profile-root", defaultSeccompRoot, "Directory path for seccomp profiles") markFlagHidden(flags, "signature-policy") } + flags.StringVar(&playKubeCommand.Network, "network", "", "Connect pod to CNI network(s)") } func playKubeCmd(c *cliconfig.KubePlayValues) error { |