forked from containerd/nerdctl
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
inspect: show mounts info from CRI/ctr containers
Fix containerd#2934 Containers created by CRI or ctr with bind mounts don't have label "nerdct/mounts". However, 'inspect' with dockercompat mode only parses mounts from label "nerdct/mounts". After this patch, 'inspect' with dockercompat mode can show CRI and ctr container bind mounts. ResolvConfPath, HostnamePath and Hostname are taken to the same consideration. Signed-off-by: baijia <baijia.wr@antgroup.com>
- Loading branch information
baijia
committed
May 6, 2024
1 parent
54b2956
commit 4b9de97
Showing
2 changed files
with
279 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,236 @@ | ||
| /* | ||
| Copyright The containerd Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package dockercompat | ||
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "runtime" | ||
| "testing" | ||
|
|
||
| "github.com/containerd/containerd" | ||
| "github.com/containerd/containerd/containers" | ||
| "github.com/containerd/nerdctl/v2/pkg/inspecttypes/native" | ||
|
|
||
| "github.com/opencontainers/runtime-spec/specs-go" | ||
| "gotest.tools/v3/assert" | ||
| ) | ||
|
|
||
| func TestContainerFromNative(t *testing.T) { | ||
| tempStateDir, err := os.MkdirTemp(t.TempDir(), "rw") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| os.WriteFile(filepath.Join(tempStateDir, "resolv.conf"), []byte(""), 0644) | ||
| defer os.RemoveAll(tempStateDir) | ||
|
|
||
| testcase := []struct { | ||
| name string | ||
| n *native.Container | ||
| expected *Container | ||
| }{ | ||
| // nerdctl container, mount /mnt/foo:/mnt/foo:rw,rslave; ResolvConfPath; hostname | ||
| { | ||
| name: "container from nerdctl", | ||
| n: &native.Container{ | ||
| Container: containers.Container{ | ||
| Labels: map[string]string{ | ||
| "nerdctl/mounts": "[{\"Type\":\"bind\",\"Source\":\"/mnt/foo\",\"Destination\":\"/mnt/foo\",\"Mode\":\"rshared,rw\",\"RW\":true,\"Propagation\":\"rshared\"}]", | ||
| "nerdctl/state-dir": tempStateDir, | ||
| "nerdctl/hostname": "host1", | ||
| }, | ||
| }, | ||
| Spec: &specs.Spec{}, | ||
| Process: &native.Process{ | ||
| Pid: 10000, | ||
| Status: containerd.Status{ | ||
| Status: "running", | ||
| }, | ||
| }, | ||
| }, | ||
| expected: &Container{ | ||
| Created: "0001-01-01T00:00:00Z", | ||
| Platform: runtime.GOOS, | ||
| ResolvConfPath: tempStateDir + "/resolv.conf", | ||
| State: &ContainerState{ | ||
| Status: "running", | ||
| Running: true, | ||
| Pid: 10000, | ||
| FinishedAt: "0001-01-01T00:00:00Z", | ||
| }, | ||
| Mounts: []MountPoint{ | ||
| { | ||
| Type: "bind", | ||
| Source: "/mnt/foo", | ||
| Destination: "/mnt/foo", | ||
| Mode: "rshared,rw", | ||
| RW: true, | ||
| Propagation: "rshared", | ||
| }, | ||
| }, | ||
| Config: &Config{ | ||
| Labels: map[string]string{ | ||
| "nerdctl/mounts": "[{\"Type\":\"bind\",\"Source\":\"/mnt/foo\",\"Destination\":\"/mnt/foo\",\"Mode\":\"rshared,rw\",\"RW\":true,\"Propagation\":\"rshared\"}]", | ||
| "nerdctl/state-dir": tempStateDir, | ||
| "nerdctl/hostname": "host1", | ||
| }, | ||
| Hostname: "host1", | ||
| }, | ||
| }, | ||
| }, | ||
| // cri container, mount /mnt/foo:/mnt/foo:rw,rslave; mount resolv.conf and hostname; internal sysfs mount | ||
| { | ||
| name: "container from cri", | ||
| n: &native.Container{ | ||
| Container: containers.Container{}, | ||
| Spec: &specs.Spec{ | ||
| Mounts: []specs.Mount{ | ||
| { | ||
| Destination: "/etc/resolv.conf", | ||
| Type: "bind", | ||
| Source: "/mock-sandbox-dir/resolv.conf", | ||
| Options: []string{"rbind", "rprivate", "rw"}, | ||
| }, | ||
| { | ||
| Destination: "/etc/hostname", | ||
| Type: "bind", | ||
| Source: "/mock-sandbox-dir/hostname", | ||
| Options: []string{"rbind", "rprivate", "rw"}, | ||
| }, | ||
| { | ||
| Destination: "/mnt/foo", | ||
| Type: "bind", | ||
| Source: "/mnt/foo", | ||
| Options: []string{"rbind", "rslave", "rw"}, | ||
| }, | ||
| { | ||
| Destination: "/sys", | ||
| Type: "sysfs", | ||
| Source: "sysfs", | ||
| Options: []string{"nosuid", "noexec", "nodev", "ro"}, | ||
| }, | ||
| }, | ||
| }, | ||
| Process: &native.Process{ | ||
| Pid: 10000, | ||
| Status: containerd.Status{ | ||
| Status: "running", | ||
| }, | ||
| }, | ||
| }, | ||
| expected: &Container{ | ||
| Created: "0001-01-01T00:00:00Z", | ||
| Platform: runtime.GOOS, | ||
| ResolvConfPath: "/mock-sandbox-dir/resolv.conf", | ||
| HostnamePath: "/mock-sandbox-dir/hostname", | ||
| State: &ContainerState{ | ||
| Status: "running", | ||
| Running: true, | ||
| Pid: 10000, | ||
| FinishedAt: "0001-01-01T00:00:00Z", | ||
| }, | ||
| Mounts: []MountPoint{ | ||
| { | ||
| Type: "bind", | ||
| Source: "/mock-sandbox-dir/resolv.conf", | ||
| Destination: "/etc/resolv.conf", | ||
| Mode: "rbind,rprivate,rw", | ||
| RW: true, | ||
| Propagation: "rprivate", | ||
| }, | ||
| { | ||
| Type: "bind", | ||
| Source: "/mock-sandbox-dir/hostname", | ||
| Destination: "/etc/hostname", | ||
| Mode: "rbind,rprivate,rw", | ||
| RW: true, | ||
| Propagation: "rprivate", | ||
| }, | ||
| { | ||
| Type: "bind", | ||
| Source: "/mnt/foo", | ||
| Destination: "/mnt/foo", | ||
| Mode: "rbind,rslave,rw", | ||
| RW: true, | ||
| Propagation: "rslave", | ||
| }, | ||
| // ignore sysfs mountpoint | ||
| }, | ||
| Config: &Config{}, | ||
| }, | ||
| }, | ||
| // ctr container, mount /mnt/foo:/mnt/foo:rw,rslave; internal sysfs mount; hostname | ||
| { | ||
| name: "container from ctr", | ||
| n: &native.Container{ | ||
| Container: containers.Container{}, | ||
| Spec: &specs.Spec{ | ||
| Hostname: "host1", | ||
| Mounts: []specs.Mount{ | ||
| { | ||
| Destination: "/mnt/foo", | ||
| Type: "bind", | ||
| Source: "/mnt/foo", | ||
| Options: []string{"rbind", "rslave", "rw"}, | ||
| }, | ||
| { | ||
| Destination: "/sys", | ||
| Type: "sysfs", | ||
| Source: "sysfs", | ||
| Options: []string{"nosuid", "noexec", "nodev", "ro"}, | ||
| }, | ||
| }, | ||
| }, | ||
| Process: &native.Process{ | ||
| Pid: 10000, | ||
| Status: containerd.Status{ | ||
| Status: "running", | ||
| }, | ||
| }, | ||
| }, | ||
| expected: &Container{ | ||
| Created: "0001-01-01T00:00:00Z", | ||
| Platform: runtime.GOOS, | ||
| State: &ContainerState{ | ||
| Status: "running", | ||
| Running: true, | ||
| Pid: 10000, | ||
| FinishedAt: "0001-01-01T00:00:00Z", | ||
| }, | ||
| Mounts: []MountPoint{ | ||
| { | ||
| Type: "bind", | ||
| Source: "/mnt/foo", | ||
| Destination: "/mnt/foo", | ||
| Mode: "rbind,rslave,rw", | ||
| RW: true, | ||
| Propagation: "rslave", | ||
| }, | ||
| // ignore sysfs mountpoint | ||
| }, | ||
| Config: &Config{ | ||
| Hostname: "host1", | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testcase { | ||
| d, _ := ContainerFromNative(tc.n) | ||
| assert.DeepEqual(t, d, tc.expected) | ||
| } | ||
| } |