github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-17 23:07:55 +00:00
Code Issues Projects Releases Wiki Activity

tests: k8s: clarify the need to use containerd.sock

Browse Source 
Modify the permissions of containerd.sock just when genpolicy needs
access to this socket, when testing GENPOLICY_PULL_METHOD=containerd.

Signed-off-by: Dan Mihai <dmihai@microsoft.com>
This commit is contained in:
Dan Mihai
2024-07-11 15:48:43 +00:00
parent c1247cc254
commit 09c5ca8032
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/integration/kubernetes/gha-run.sh
View File

@@ -289,6 +289,12 @@ function run_tests() {
sudo containerd config default | sudo tee /etc/containerd/config.toml > /dev/null sudo containerd config default | sudo tee /etc/containerd/config.toml > /dev/null
echo "containerd config has been set to default" echo "containerd config has been set to default"
sudo systemctl restart containerd && sudo systemctl is-active containerd sudo systemctl restart containerd && sudo systemctl is-active containerd
# Allow genpolicy to access the containerd image pull APIs without sudo.
local socket_wait_time=30
local socket_sleep_time=3
local cmd="sudo chmod a+rw /var/run/containerd/containerd.sock"
waitForProcess "${socket_wait_time}" "${socket_sleep_time}" "$cmd"
fi fi
set_test_cluster_namespace set_test_cluster_namespace

3
tests/integration/kubernetes/tests_common.sh
View File

@@ -143,9 +143,6 @@ create_common_genpolicy_settings() {
# Set the default namespace of Kata CI tests in the genpolicy settings. # Set the default namespace of Kata CI tests in the genpolicy settings.
set_namespace_to_policy_settings "${genpolicy_settings_dir}" "${TEST_CLUSTER_NAMESPACE}" set_namespace_to_policy_settings "${genpolicy_settings_dir}" "${TEST_CLUSTER_NAMESPACE}"
# allow genpolicy to access containerd without sudo
sudo chmod a+rw /var/run/containerd/containerd.sock
} }
# If auto-generated policy testing is enabled, make a copy of the common genpolicy settings # If auto-generated policy testing is enabled, make a copy of the common genpolicy settings