diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-01 13:27:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 13:27:17 -0400 |
| commit | 1b88b678cf14946c4392bccfd9db2ff8510066ee (patch) | |
| tree | 2b83b71166121cf0a85b3a8869627a481bd0a5de /pkg/specgen | |
| parent | c6a896b0c705415a9115dff354b0a19a2c08ce50 (diff) | |
| parent | 641f0ccc4eb999af3c2a01d709769287ba45451c (diff) | |
| download | podman-1b88b678cf14946c4392bccfd9db2ff8510066ee.tar.gz podman-1b88b678cf14946c4392bccfd9db2ff8510066ee.tar.bz2 podman-1b88b678cf14946c4392bccfd9db2ff8510066ee.zip | |
Merge pull request #11707 from rhatdan/play
Add podman play kube --no-hosts options
Diffstat (limited to 'pkg/specgen')
| -rw-r--r-- | pkg/specgen/generate/kube/kube.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index 9389b1a20..194c8dce5 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -26,8 +26,8 @@ import ( ) func ToPodOpt(ctx context.Context, podName string, p entities.PodCreateOptions, podYAML *v1.PodTemplateSpec) (entities.PodCreateOptions, error) { - // p := specgen.NewPodSpecGenerator() - p.Net = &entities.NetOptions{} + p.Net = &entities.NetOptions{NoHosts: p.Net.NoHosts} + p.Name = podName p.Labels = podYAML.ObjectMeta.Labels // Kube pods must share {ipc, net, uts} by default @@ -47,6 +47,9 @@ func ToPodOpt(ctx context.Context, podName string, p entities.PodCreateOptions, p.Net.Network = specgen.Namespace{NSMode: "host"} } if podYAML.Spec.HostAliases != nil { + if p.Net.NoHosts { + return p, errors.New("HostAliases in yaml file will not work with --no-hosts") + } hosts := make([]string, 0, len(podYAML.Spec.HostAliases)) for _, hostAlias := range podYAML.Spec.HostAliases { for _, host := range hostAlias.Hostnames { |