From e9ddcbc7671a2ef5c5df9b60a04cc133222c903d Mon Sep 17 00:00:00 2001 From: Rancher Desktop Dependency Manager Date: Thu, 7 Sep 2023 19:43:19 +0000 Subject: [PATCH 1/2] Bump alpineLimaISO from 0.2.31.rd4 to 0.2.31.rd6 Signed-off-by: Rancher Desktop Dependency Manager --- pkg/rancher-desktop/assets/dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/rancher-desktop/assets/dependencies.yaml b/pkg/rancher-desktop/assets/dependencies.yaml index f900cac496d..8c13d818fc6 100644 --- a/pkg/rancher-desktop/assets/dependencies.yaml +++ b/pkg/rancher-desktop/assets/dependencies.yaml @@ -1,6 +1,6 @@ limaAndQemu: 1.31.2 alpineLimaISO: - isoVersion: 0.2.31.rd4 + isoVersion: 0.2.31.rd6 alpineVersion: 3.18.0 WSLDistro: "0.46" kuberlr: 0.4.2 From 710e7bc4e0075995ffce15340c265450d307db98 Mon Sep 17 00:00:00 2001 From: Jan Dubois Date: Thu, 7 Sep 2023 12:45:20 -0700 Subject: [PATCH 2/2] Revert "Switch to cgroup v2 for extension BATS tests on Lima" This reverts commit a2b57b7ceba5c48a61fa10fc13d575b103ef5c46. Signed-off-by: Jan Dubois --- bats/tests/extensions/allow-list.bats | 14 -------------- bats/tests/extensions/containers.bats | 14 -------------- bats/tests/extensions/install.bats | 14 -------------- 3 files changed, 42 deletions(-) diff --git a/bats/tests/extensions/allow-list.bats b/bats/tests/extensions/allow-list.bats index 479a183bef6..d0450556679 100644 --- a/bats/tests/extensions/allow-list.bats +++ b/bats/tests/extensions/allow-list.bats @@ -47,20 +47,6 @@ check_extension_installed() { # refute, name @test 'start container engine' { RD_ENV_EXTENSIONS=1 start_container_engine -} - -@test 'switch to cgroup v2' { - # TODO TODO TODO This is a workaround because #5363 hasn't been fixed yet - if is_windows; then - skip "Skipped because switching cgroup layout is not needed on Windows" - fi - wait_for_shell - rdctl shell sudo sed -E -i 's/#(rc_cgroup_mode).*/\1="unified"/' /etc/rc.conf - rdctl shutdown - RD_ENV_EXTENSIONS=1 start_container_engine -} - -@test 'wait for container engine' { wait_for_container_engine } diff --git a/bats/tests/extensions/containers.bats b/bats/tests/extensions/containers.bats index 21f784a9509..8ebd07ac171 100644 --- a/bats/tests/extensions/containers.bats +++ b/bats/tests/extensions/containers.bats @@ -26,20 +26,6 @@ encoded_id() { # variant @test 'start container engine' { RD_ENV_EXTENSIONS=1 start_container_engine -} - -@test 'switch to cgroup v2' { - # TODO TODO TODO This is a workaround because #5363 hasn't been fixed yet - if is_windows; then - skip "Skipped because switching cgroup layout is not needed on Windows" - fi - wait_for_shell - rdctl shell sudo sed -E -i 's/#(rc_cgroup_mode).*/\1="unified"/' /etc/rc.conf - rdctl shutdown - RD_ENV_EXTENSIONS=1 start_container_engine -} - -@test 'wait for container engine' { wait_for_container_engine } diff --git a/bats/tests/extensions/install.bats b/bats/tests/extensions/install.bats index 4aaad5f0c95..2f68d617433 100644 --- a/bats/tests/extensions/install.bats +++ b/bats/tests/extensions/install.bats @@ -36,20 +36,6 @@ encoded_id() { # variant @test 'start container engine' { RD_ENV_EXTENSIONS=1 start_container_engine -} - -@test 'switch to cgroup v2' { - # TODO TODO TODO This is a workaround because #5363 hasn't been fixed yet - if is_windows; then - skip "Skipped because switching cgroup layout is not needed on Windows" - fi - wait_for_shell - rdctl shell sudo sed -E -i 's/#(rc_cgroup_mode).*/\1="unified"/' /etc/rc.conf - rdctl shutdown - RD_ENV_EXTENSIONS=1 start_container_engine -} - -@test 'wait for container engine' { wait_for_container_engine }