opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 09:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14852 from cdoern/podUTS

Browse Source 
fix namespace reporting
This commit is contained in:
Ed Santiago
2022-07-07 11:22:40 -06:00
committed by GitHub
parent dd0418a5fe 0424084b30
commit d52ac4422b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/specgen/podspecgen.go
View File

@ -77,6 +77,8 @@ type PodBasicConfig struct {
// Any containers created within the pod will inherit the pod's userns settings. // Any containers created within the pod will inherit the pod's userns settings.
// Optional // Optional
Userns Namespace `json:"userns,omitempty"` 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 contains user specified Devices to be added to the Pod
Devices []string `json:"pod_devices,omitempty"` Devices []string `json:"pod_devices,omitempty"`
// Sysctl sets kernel parameters for the pod // Sysctl sets kernel parameters for the pod

4
test/e2e/pod_create_test.go
View File

@ -1145,9 +1145,7 @@ ENTRYPOINT ["sleep","99999"]
session = podmanTest.Podman([]string{"run", "-it", "--pod", session.OutputToString(), ALPINE, "printenv", "HOSTNAME"}) session = podmanTest.Podman([]string{"run", "-it", "--pod", session.OutputToString(), ALPINE, "printenv", "HOSTNAME"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) 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" podName := "utsPod"
ns := "ns:/proc/self/ns/" ns := "ns:/proc/self/ns/"