Merge pull request #5484 from rancher-sandbox/rddepman/alpineLimaISO/…

…0.2.31.rd4-to-0.2.31.rd6 rddepman: bump alpineLimaISO from 0.2.31.rd4 to 0.2.31.rd6 This downgrades buildkit to 0.11.6 and reverts the changes to support buildkit 0.12 with hybrid cgroups.
rancher-sandbox · Sep 7, 2023 · b84729a · b84729a
2 parents f4c1fa1 + 710e7bc
commit b84729a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 43 deletions.
diff --git 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
@@ -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
@@ -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
 }
 

diff --git 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