Files
containerd/integration/container_cgroup_writable_linux_test.go
Davanum Srinivas c30f23452c cri: use upstream Kubernetes modules
Switch the CRI integration layer from containerd's forked Kubernetes helpers
and clients to the upstream Kubernetes modules, and finalize the dependency
update to Kubernetes v0.36.0.

Replace the remaining internal helper copies with upstream packages:
- internal/cri/clock -> k8s.io/utils/clock
- internal/cri/executil -> upstream CRI exec helpers
- internal/cri/resourcequantity -> k8s.io/apimachinery/pkg/api/resource
- internal/cri/setutils -> k8s.io/apimachinery/pkg/util/sets
- internal/cri/types/labels.go -> internal/cri/labels
- integration/cri-api/pkg/apis/services.go -> k8s.io/cri-api/pkg/apis/services.go

Adopt the upstream CRI clients directly:
- add k8s.io/cri-client v0.36.0, k8s.io/cri-streaming v0.36.0, and
  k8s.io/streaming v0.36.0 as direct dependencies
- promote k8s.io/utils to a direct dependency and pull in
  k8s.io/component-base v0.36.0 indirectly
- keep integration/remote as a thin containerd adapter around cri-client,
  because the integration tests still need the stream-shaped
  GetContainerEvents RPC

Finalize the Kubernetes dependency update from v0.36.0-rc.0 to v0.36.0,
refresh vendor/, and drop the obsolete internal utility copies.

Also fix the protobuf MessageState mutex-copy vet failures exposed by the new
APIs and close the temporary integration CRI clients explicitly.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2026-04-23 12:59:58 +02:00

142 lines
3.9 KiB
Go

/*
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 integration
import (
"context"
"fmt"
"os"
"path/filepath"
"syscall"
"testing"
"time"
"github.com/containerd/cgroups/v3"
"github.com/containerd/containerd/v2/integration/images"
"github.com/containerd/containerd/v2/integration/remote"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
)
func newContainerdProcess(t *testing.T, cgroupWritable bool) *ctrdProc {
configDir := t.TempDir()
configPath := filepath.Join(configDir, "config.toml")
config := fmt.Sprintf(`
version = 3
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.runc]
cgroup_writable = %t
`,
cgroupWritable)
err := os.WriteFile(configPath, []byte(config), 0600)
require.NoError(t, err)
currentProc := newCtrdProc(t, "containerd", configDir, nil)
require.NoError(t, currentProc.isReady())
return currentProc
}
func TestContainerCgroupWritable(t *testing.T) {
if cgroups.Mode() != cgroups.Unified {
t.Skip("requires cgroup v2")
}
testCases := []struct {
name string
cgroupWritable bool
}{
{
name: "writable cgroup",
cgroupWritable: true,
},
{
name: "readonly cgroup",
cgroupWritable: false,
},
}
for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) {
currentProc := newContainerdProcess(t, testCase.cgroupWritable)
// Get the runtime service
runtimeService, err := remote.NewRuntimeService(currentProc.grpcAddress(), 1*time.Minute)
require.NoError(t, err)
t.Cleanup(func() {
cleanupPods(t, runtimeService)
assert.NoError(t, runtimeService.Close(context.Background()))
t.Log("Stopping containerd process")
require.NoError(t, currentProc.kill(syscall.SIGTERM))
require.NoError(t, currentProc.wait(5*time.Minute))
})
imageName := images.Get(images.BusyBox)
pullImagesByCRI(t, currentProc.criImageService(t), imageName)
// Create a test sandbox
sbConfig := &runtime.PodSandboxConfig{
Metadata: &runtime.PodSandboxMetadata{
Name: "sandbox",
Namespace: "cgroup-writable",
},
}
sb, err := runtimeService.RunPodSandbox(sbConfig, "")
require.NoError(t, err)
containerName := "cgroup-writable-test"
cnConfig := &runtime.ContainerConfig{
Metadata: &runtime.ContainerMetadata{
Name: containerName,
},
Image: &runtime.ImageSpec{
Image: imageName,
},
Command: []string{"sh", "-c", "sleep 1d"},
}
cn, err := runtimeService.CreateContainer(sb, cnConfig, sbConfig)
require.NoError(t, err)
defer func() {
assert.NoError(t, runtimeService.RemoveContainer(cn))
}()
require.NoError(t, runtimeService.StartContainer(cn))
defer func() {
assert.NoError(t, runtimeService.StopContainer(cn, 30))
}()
status, err := runtimeService.ContainerStatus(cn)
require.NoError(t, err)
assert.Equal(t, status.GetState(), runtime.ContainerState_CONTAINER_RUNNING)
// Execute a command to verify if cgroup is writable
_, stderr, err := runtimeService.ExecSync(cn, []string{"mkdir", "sys/fs/cgroup/dummy-group"}, 2)
if testCase.cgroupWritable {
require.NoError(t, err)
require.Empty(t, stderr)
} else {
require.Error(t, err)
require.Contains(t, string(stderr), "mkdir: can't create directory 'sys/fs/cgroup/dummy-group': Read-only file system")
}
})
}
}