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

specgenutil: record the pod userns in the annotations

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2024-07-11 11:24:32 +02:00
parent e97bb79b7a
commit bbe0e4a5db
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/specgenutil/specgen.go
View File

@ -516,6 +516,10 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions
if len(s.Annotations) == 0 {
s.Annotations = annotations
}
// Add the user namespace configuration to the annotations
if c.UserNS != "" {
s.Annotations[define.UserNsAnnotation] = c.UserNS
}
if len(c.StorageOpts) > 0 {
opts := make(map[string]string, len(c.StorageOpts))

14
pkg/specgenutil/specgenutil_test.go
View File

@ -8,6 +8,7 @@ import (
"testing"
"github.com/containers/common/pkg/machine"
"github.com/containers/podman/v5/libpod/define"
"github.com/containers/podman/v5/pkg/domain/entities"
"github.com/containers/podman/v5/pkg/specgen"
"github.com/stretchr/testify/assert"
@ -216,3 +217,16 @@ func TestGenRlimits(t *testing.T) {
_, err = GenRlimits([]string{"nofile=bar:buzz"})
assert.Error(t, err, "err is not nil")
}
func TestFillOutSpecGenRecorsUserNs(t *testing.T) {
sg := specgen.NewSpecGenerator("nothing", false)
err := FillOutSpecGen(sg, &entities.ContainerCreateOptions{
ImageVolume: "ignore",
UserNS: "keep-id",
}, []string{})
assert.NoError(t, err)
v, ok := sg.Annotations[define.UserNsAnnotation]
assert.True(t, ok, "UserNsAnnotation is set")
assert.Equal(t, "keep-id", v, "UserNsAnnotation is keep-id")
}