diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-06-02 04:33:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-02 04:33:03 -0400 |
| commit | e4e100638dd7e90ecf7a554f68ebc71ea8e58f7b (patch) | |
| tree | 3a67cec5fde9abb8aa41db332646ac64d947bbb4 | |
| parent | a208bfaa521ada1a3aa66f609de3f8434c80f896 (diff) | |
| parent | f728b7b5a7585cef7f8d612ccf54481c3c6eb556 (diff) | |
| download | podman-e4e100638dd7e90ecf7a554f68ebc71ea8e58f7b.tar.gz podman-e4e100638dd7e90ecf7a554f68ebc71ea8e58f7b.tar.bz2 podman-e4e100638dd7e90ecf7a554f68ebc71ea8e58f7b.zip | |
Merge pull request #14344 from cdoern/podCreate
podman pod create --uidmap patch
| -rw-r--r-- | pkg/specgen/podspecgen.go | 5 | ||||
| -rw-r--r-- | test/system/170-run-userns.bats | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkg/specgen/podspecgen.go b/pkg/specgen/podspecgen.go index 603506241..777097ac5 100644 --- a/pkg/specgen/podspecgen.go +++ b/pkg/specgen/podspecgen.go @@ -4,6 +4,7 @@ import ( "net" "github.com/containers/common/libnetwork/types" + storageTypes "github.com/containers/storage/types" spec "github.com/opencontainers/runtime-spec/specs-go" ) @@ -222,6 +223,10 @@ type PodResourceConfig struct { type PodSecurityConfig struct { SecurityOpt []string `json:"security_opt,omitempty"` + // IDMappings are UID and GID mappings that will be used by user + // namespaces. + // Required if UserNS is private. + IDMappings *storageTypes.IDMappingOptions `json:"idmappings,omitempty"` } // NewPodSpecGenerator creates a new pod spec diff --git a/test/system/170-run-userns.bats b/test/system/170-run-userns.bats index b80351902..46cb37b9d 100644 --- a/test/system/170-run-userns.bats +++ b/test/system/170-run-userns.bats @@ -38,10 +38,12 @@ function _require_crun() { @test "rootful pod with custom ID mapping" { skip_if_rootless "does not work rootless - rootful feature" - skip_if_remote "remote --uidmap is broken (see #14233)" random_pod_name=$(random_string 30) run_podman pod create --uidmap 0:200000:5000 --name=$random_pod_name run_podman pod start $random_pod_name + run_podman pod inspect --format '{{.InfraContainerID}}' $random_pod_name + run podman inspect --format '{{.HostConfig.IDMappings.UIDMap}}' $output + is "$output" ".*0:200000:5000" "UID Map Successful" # Remove the pod and the pause image run_podman pod rm $random_pod_name |