diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-12-09 16:30:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-09 16:30:58 -0500 |
| commit | f80a7fda745a96a895184b92077a6356c305c2bb (patch) | |
| tree | 187c6caac6f403fa375e7066105b3fa545091143 /pkg | |
| parent | b24f2ae9019a5d0d381944e502fdeecffaeb445c (diff) | |
| parent | 593d0907c5c11e933be7dbdce98022f76183ea3c (diff) | |
| download | podman-f80a7fda745a96a895184b92077a6356c305c2bb.tar.gz podman-f80a7fda745a96a895184b92077a6356c305c2bb.tar.bz2 podman-f80a7fda745a96a895184b92077a6356c305c2bb.zip | |
Merge pull request #12555 from rhatdan/pod
--hostname should be set with podman create --pod new:PODNAME
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/domain/entities/types.go | 5 | ||||
| -rw-r--r-- | pkg/specgen/generate/namespaces.go | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go index ec4d4a902..e062b9442 100644 --- a/pkg/domain/entities/types.go +++ b/pkg/domain/entities/types.go @@ -29,8 +29,6 @@ type PodDeleteReport struct{ Report } type VolumeDeleteOptions struct{} type VolumeDeleteReport struct{ Report } -// NetOptions reflect the shared network options between -// pods and containers type NetFlags struct { AddHosts []string `json:"add-host,omitempty"` DNS []string `json:"dns,omitempty"` @@ -43,6 +41,9 @@ type NetFlags struct { Network string `json:"network,omitempty"` NetworkAlias []string `json:"network-alias,omitempty"` } + +// NetOptions reflect the shared network options between +// pods and containers type NetOptions struct { AddHosts []string `json:"hostadd,omitempty"` Aliases []string `json:"network_alias,omitempty"` diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index 5349e224f..7d63fc10f 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -474,7 +474,7 @@ func GetNamespaceOptions(ns []string, netnsIsHost bool) ([]libpod.PodCreateOptio case "none": return erroredOptions, nil default: - return erroredOptions, errors.Errorf("Invalid kernel namespace to share: %s. Options are: net, pid, ipc, uts or none", toShare) + return erroredOptions, errors.Errorf("Invalid kernel namespace to share: %s. Options are: cgroup, ipc, net, pid, uts or none", toShare) } } return options, nil |