diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-07-07 11:22:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-07 11:22:40 -0600 |
| commit | d52ac4422b1b8f959e411b13680e7fb40880a939 (patch) | |
| tree | cc49d83571c8f8750061407219d6eb02ba7effb3 | |
| parent | dd0418a5fe0c44d4358b0118bd2a9847d78a80a2 (diff) | |
| parent | 0424084b303b2ebb0a0fa28c6dd3f1ef456ce4ba (diff) | |
| download | podman-d52ac4422b1b8f959e411b13680e7fb40880a939.tar.gz podman-d52ac4422b1b8f959e411b13680e7fb40880a939.tar.bz2 podman-d52ac4422b1b8f959e411b13680e7fb40880a939.zip | |
Merge pull request #14852 from cdoern/podUTS
fix namespace reporting
| -rw-r--r-- | pkg/specgen/podspecgen.go | 2 | ||||
| -rw-r--r-- | test/e2e/pod_create_test.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/specgen/podspecgen.go b/pkg/specgen/podspecgen.go index 02ba06be1..64a79f4ee 100644 --- a/pkg/specgen/podspecgen.go +++ b/pkg/specgen/podspecgen.go @@ -77,6 +77,8 @@ type PodBasicConfig struct { // Any containers created within the pod will inherit the pod's userns settings. // Optional Userns Namespace `json:"userns,omitempty"` + // UtsNs is used to indicate the UTS mode the pod is in + UtsNs Namespace `json:"utsns,omitempty"` // Devices contains user specified Devices to be added to the Pod Devices []string `json:"pod_devices,omitempty"` // Sysctl sets kernel parameters for the pod diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index 10a8d52b5..3caae2bd5 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -1145,9 +1145,7 @@ ENTRYPOINT ["sleep","99999"] session = podmanTest.Podman([]string{"run", "-it", "--pod", session.OutputToString(), ALPINE, "printenv", "HOSTNAME"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - if !IsRemote() { // remote hostname will not match os.Hostname() - Expect(session.OutputToString()).To(ContainSubstring(hostname)) - } + Expect(session.OutputToString()).To(ContainSubstring(hostname)) podName := "utsPod" ns := "ns:/proc/self/ns/" |