summaryrefslogtreecommitdiffhomepage
path: root/pkg/shim/utils
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/shim/utils')
-rw-r--r--pkg/shim/utils/BUILD37
-rw-r--r--pkg/shim/utils/errors_test.go50
-rw-r--r--pkg/shim/utils/utils_state_autogen.go3
-rw-r--r--pkg/shim/utils/volumes_test.go330
4 files changed, 3 insertions, 417 deletions
diff --git a/pkg/shim/utils/BUILD b/pkg/shim/utils/BUILD
deleted file mode 100644
index 2eb82f63c..000000000
--- a/pkg/shim/utils/BUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-load("//tools:defs.bzl", "go_library", "go_test")
-
-package(licenses = ["notice"])
-
-go_library(
- name = "utils",
- srcs = [
- "annotations.go",
- "errors.go",
- "utils.go",
- "volumes.go",
- ],
- visibility = [
- "//pkg/shim:__subpackages__",
- "//shim:__subpackages__",
- ],
- deps = [
- "@com_github_containerd_containerd//errdefs:go_default_library",
- "@com_github_opencontainers_runtime_spec//specs-go:go_default_library",
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
- ],
-)
-
-go_test(
- name = "utils_test",
- size = "small",
- srcs = [
- "errors_test.go",
- "volumes_test.go",
- ],
- library = ":utils",
- deps = [
- "@com_github_containerd_containerd//errdefs:go_default_library",
- "@com_github_opencontainers_runtime_spec//specs-go:go_default_library",
- ],
-)
diff --git a/pkg/shim/utils/errors_test.go b/pkg/shim/utils/errors_test.go
deleted file mode 100644
index 0a8fe34c8..000000000
--- a/pkg/shim/utils/errors_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2021 The gVisor 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
-//
-// https://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 utils
-
-import (
- "fmt"
- "testing"
-
- "github.com/containerd/containerd/errdefs"
-)
-
-func TestGRPCRoundTripsErrors(t *testing.T) {
- for _, tc := range []struct {
- name string
- err error
- test func(err error) bool
- }{
- {
- name: "passthrough",
- err: errdefs.ErrNotFound,
- test: errdefs.IsNotFound,
- },
- {
- name: "wrapped",
- err: fmt.Errorf("oh no: %w", errdefs.ErrNotFound),
- test: errdefs.IsNotFound,
- },
- } {
- t.Run(tc.name, func(t *testing.T) {
- if err := errdefs.FromGRPC(ErrToGRPC(tc.err)); !tc.test(err) {
- t.Errorf("errToGRPC got %+v", err)
- }
- if err := errdefs.FromGRPC(ErrToGRPCf(tc.err, "testing %s", "123")); !tc.test(err) {
- t.Errorf("errToGRPCf got %+v", err)
- }
- })
- }
-}
diff --git a/pkg/shim/utils/utils_state_autogen.go b/pkg/shim/utils/utils_state_autogen.go
new file mode 100644
index 000000000..dba8bfb1a
--- /dev/null
+++ b/pkg/shim/utils/utils_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package utils
diff --git a/pkg/shim/utils/volumes_test.go b/pkg/shim/utils/volumes_test.go
deleted file mode 100644
index 5db43cdf1..000000000
--- a/pkg/shim/utils/volumes_test.go
+++ /dev/null
@@ -1,330 +0,0 @@
-// Copyright 2019 The gVisor 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
-//
-// https://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 utils
-
-import (
- "fmt"
- "io/ioutil"
- "os"
- "reflect"
- "testing"
-
- specs "github.com/opencontainers/runtime-spec/specs-go"
-)
-
-func TestUpdateVolumeAnnotations(t *testing.T) {
- dir, err := ioutil.TempDir("", "test-update-volume-annotations")
- if err != nil {
- t.Fatalf("create tempdir: %v", err)
- }
- defer os.RemoveAll(dir)
- kubeletPodsDir = dir
-
- const (
- testPodUID = "testuid"
- testVolumeName = "testvolume"
- testLogDirPath = "/var/log/pods/testns_testname_" + testPodUID
- testLegacyLogDirPath = "/var/log/pods/" + testPodUID
- )
- testVolumePath := fmt.Sprintf("%s/%s/volumes/kubernetes.io~empty-dir/%s", dir, testPodUID, testVolumeName)
-
- if err := os.MkdirAll(testVolumePath, 0755); err != nil {
- t.Fatalf("Create test volume: %v", err)
- }
-
- for _, test := range []struct {
- name string
- spec *specs.Spec
- expected *specs.Spec
- expectErr bool
- expectUpdate bool
- }{
- {
- name: "volume annotations for sandbox",
- spec: &specs.Spec{
- Annotations: map[string]string{
- sandboxLogDirAnnotation: testLogDirPath,
- ContainerTypeAnnotation: containerTypeSandbox,
- volumeKeyPrefix + testVolumeName + ".share": "pod",
- volumeKeyPrefix + testVolumeName + ".type": "tmpfs",
- volumeKeyPrefix + testVolumeName + ".options": "ro",
- },
- },
- expected: &specs.Spec{
- Annotations: map[string]string{
- sandboxLogDirAnnotation: testLogDirPath,
- ContainerTypeAnnotation: containerTypeSandbox,
- volumeKeyPrefix + testVolumeName + ".share": "pod",
- volumeKeyPrefix + testVolumeName + ".type": "tmpfs",
- volumeKeyPrefix + testVolumeName + ".options": "ro",
- volumeKeyPrefix + testVolumeName + ".source": testVolumePath,
- },
- },
- expectUpdate: true,
- },
- {
- name: "volume annotations for sandbox with legacy log path",
- spec: &specs.Spec{
- Annotations: map[string]string{
- sandboxLogDirAnnotation: testLegacyLogDirPath,
- ContainerTypeAnnotation: containerTypeSandbox,
- volumeKeyPrefix + testVolumeName + ".share": "pod",
- volumeKeyPrefix + testVolumeName + ".type": "tmpfs",
- volumeKeyPrefix + testVolumeName + ".options": "ro",
- },
- },
- expected: &specs.Spec{
- Annotations: map[string]string{
- sandboxLogDirAnnotation: testLegacyLogDirPath,
- ContainerTypeAnnotation: containerTypeSandbox,
- volumeKeyPrefix + testVolumeName + ".share": "pod",
- volumeKeyPrefix + testVolumeName + ".type": "tmpfs",
- volumeKeyPrefix + testVolumeName + ".options": "ro",
- volumeKeyPrefix + testVolumeName + ".source": testVolumePath,
- },
- },
- expectUpdate: true,
- },
- {
- name: "tmpfs: volume annotations for container",
- spec: &specs.Spec{
- Mounts: []specs.Mount{
- {
- Destination: "/test",
- Type: "bind",
- Source: testVolumePath,
- Options: []string{"ro"},
- },
- {
- Destination: "/random",
- Type: "bind",
- Source: "/random",
- Options: []string{"ro"},
- },
- },
- Annotations: map[string]string{
- ContainerTypeAnnotation: ContainerTypeContainer,
- volumeKeyPrefix + testVolumeName + ".share": "pod",
- volumeKeyPrefix + testVolumeName + ".type": "tmpfs",
- volumeKeyPrefix + testVolumeName + ".options": "ro",
- },
- },
- expected: &specs.Spec{
- Mounts: []specs.Mount{
- {
- Destination: "/test",
- Type: "tmpfs",
- Source: testVolumePath,
- Options: []string{"ro"},
- },
- {
- Destination: "/random",
- Type: "bind",
- Source: "/random",
- Options: []string{"ro"},
- },
- },
- Annotations: map[string]string{
- ContainerTypeAnnotation: ContainerTypeContainer,
- volumeKeyPrefix + testVolumeName + ".share": "pod",
- volumeKeyPrefix + testVolumeName + ".type": "tmpfs",
- volumeKeyPrefix + testVolumeName + ".options": "ro",
- },
- },
- expectUpdate: true,
- },
- {
- name: "bind: volume annotations for container",
- spec: &specs.Spec{
- Mounts: []specs.Mount{
- {
- Destination: "/test",
- Type: "bind",
- Source: testVolumePath,
- Options: []string{"ro"},
- },
- },
- Annotations: map[string]string{
- ContainerTypeAnnotation: ContainerTypeContainer,
- volumeKeyPrefix + testVolumeName + ".share": "container",
- volumeKeyPrefix + testVolumeName + ".type": "bind",
- volumeKeyPrefix + testVolumeName + ".options": "ro",
- },
- },
- expected: &specs.Spec{
- Mounts: []specs.Mount{
- {
- Destination: "/test",
- Type: "bind",
- Source: testVolumePath,
- Options: []string{"ro"},
- },
- },
- Annotations: map[string]string{
- ContainerTypeAnnotation: ContainerTypeContainer,
- volumeKeyPrefix + testVolumeName + ".share": "container",
- volumeKeyPrefix + testVolumeName + ".type": "bind",
- volumeKeyPrefix + testVolumeName + ".options": "ro",
- },
- },
- expectUpdate: true,
- },
- {
- name: "should not return error without pod log directory",
- spec: &specs.Spec{
- Annotations: map[string]string{
- ContainerTypeAnnotation: containerTypeSandbox,
- volumeKeyPrefix + testVolumeName + ".share": "pod",
- volumeKeyPrefix + testVolumeName + ".type": "tmpfs",
- volumeKeyPrefix + testVolumeName + ".options": "ro",
- },
- },
- expected: &specs.Spec{
- Annotations: map[string]string{
- ContainerTypeAnnotation: containerTypeSandbox,
- volumeKeyPrefix + testVolumeName + ".share": "pod",
- volumeKeyPrefix + testVolumeName + ".type": "tmpfs",
- volumeKeyPrefix + testVolumeName + ".options": "ro",
- },
- },
- },
- {
- name: "should return error if volume path does not exist",
- spec: &specs.Spec{
- Annotations: map[string]string{
- sandboxLogDirAnnotation: testLogDirPath,
- ContainerTypeAnnotation: containerTypeSandbox,
- volumeKeyPrefix + "notexist.share": "pod",
- volumeKeyPrefix + "notexist.type": "tmpfs",
- volumeKeyPrefix + "notexist.options": "ro",
- },
- },
- expectErr: true,
- },
- {
- name: "no volume annotations for sandbox",
- spec: &specs.Spec{
- Annotations: map[string]string{
- sandboxLogDirAnnotation: testLogDirPath,
- ContainerTypeAnnotation: containerTypeSandbox,
- },
- },
- expected: &specs.Spec{
- Annotations: map[string]string{
- sandboxLogDirAnnotation: testLogDirPath,
- ContainerTypeAnnotation: containerTypeSandbox,
- },
- },
- },
- {
- name: "no volume annotations for container",
- spec: &specs.Spec{
- Mounts: []specs.Mount{
- {
- Destination: "/test",
- Type: "bind",
- Source: "/test",
- Options: []string{"ro"},
- },
- {
- Destination: "/random",
- Type: "bind",
- Source: "/random",
- Options: []string{"ro"},
- },
- },
- Annotations: map[string]string{
- ContainerTypeAnnotation: ContainerTypeContainer,
- },
- },
- expected: &specs.Spec{
- Mounts: []specs.Mount{
- {
- Destination: "/test",
- Type: "bind",
- Source: "/test",
- Options: []string{"ro"},
- },
- {
- Destination: "/random",
- Type: "bind",
- Source: "/random",
- Options: []string{"ro"},
- },
- },
- Annotations: map[string]string{
- ContainerTypeAnnotation: ContainerTypeContainer,
- },
- },
- },
- {
- name: "bind options removed",
- spec: &specs.Spec{
- Annotations: map[string]string{
- ContainerTypeAnnotation: ContainerTypeContainer,
- volumeKeyPrefix + testVolumeName + ".share": "pod",
- volumeKeyPrefix + testVolumeName + ".type": "tmpfs",
- volumeKeyPrefix + testVolumeName + ".options": "ro",
- volumeKeyPrefix + testVolumeName + ".source": testVolumePath,
- },
- Mounts: []specs.Mount{
- {
- Destination: "/dst",
- Type: "bind",
- Source: testVolumePath,
- Options: []string{"ro", "bind", "rbind"},
- },
- },
- },
- expected: &specs.Spec{
- Annotations: map[string]string{
- ContainerTypeAnnotation: ContainerTypeContainer,
- volumeKeyPrefix + testVolumeName + ".share": "pod",
- volumeKeyPrefix + testVolumeName + ".type": "tmpfs",
- volumeKeyPrefix + testVolumeName + ".options": "ro",
- volumeKeyPrefix + testVolumeName + ".source": testVolumePath,
- },
- Mounts: []specs.Mount{
- {
- Destination: "/dst",
- Type: "tmpfs",
- Source: testVolumePath,
- Options: []string{"ro"},
- },
- },
- },
- expectUpdate: true,
- },
- } {
- t.Run(test.name, func(t *testing.T) {
- updated, err := UpdateVolumeAnnotations(test.spec)
- if test.expectErr {
- if err == nil {
- t.Fatal("Expected error, but got nil")
- }
- return
- }
- if err != nil {
- t.Fatalf("Unexpected error: %v", err)
- }
- if !reflect.DeepEqual(test.expected, test.spec) {
- t.Fatalf("Expected %+v, got %+v", test.expected, test.spec)
- }
- if test.expectUpdate != updated {
- t.Errorf("Expected %v, got %v", test.expected, updated)
- }
- })
- }
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 09:57:51 +0000