Merge pull request #14852 from cdoern/podUTS

fix namespace reporting
This commit is contained in:
Ed Santiago
2022-07-07 11:22:40 -06:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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))
}
podName := "utsPod"
ns := "ns:/proc/self/ns/"