Merge pull request #8068 from jandubois/bump-1.17.1

Bump package version 1.17.0 → 1.17.1
rancher-sandbox · Jan 17, 2025 · ff41d52 · ff41d52
2 parents 10c1e28 + 5db923b
commit ff41d52
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 32 deletions.
diff --git a/bats/tests/utils/spin.bats b/bats/tests/utils/spin.bats
@@ -41,8 +41,6 @@ dir_exists() {
 }
 
 @test 'plugins are installed' {
-    run dir_exists "${SPIN_DATA_DIR}/plugins/js2wasm"
-    assert_success
     run dir_exists "${SPIN_DATA_DIR}/plugins/kube"
     assert_success
 }

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "rancher-desktop",
   "productName": "Rancher Desktop",
   "license": "Apache-2.0",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "author": {
     "name": "SUSE",
     "email": "[email protected]"

diff --git a/packaging/linux/appimage.yml b/packaging/linux/appimage.yml
@@ -9,6 +9,7 @@ build:
 script:
   - rm -rf $BUILD_APPDIR/* && mkdir -p $BUILD_APPDIR/opt/rancher-desktop $BUILD_APPDIR/usr/share/metainfo $BUILD_APPDIR/usr/bin $BUILD_APPDIR/usr/lib64
   - unzip $BUILD_SOURCE_DIR/rancher-desktop.zip -d $BUILD_APPDIR/opt/rancher-desktop
+  - chmod 04755 $BUILD_APPDIR/opt/rancher-desktop/chrome-sandbox
   - mv $BUILD_APPDIR/opt/rancher-desktop/resources/resources/linux/rancher-desktop.desktop $BUILD_APPDIR
   - convert -resize 512x512 $BUILD_APPDIR/opt/rancher-desktop/resources/resources/icons/logo-square-512.png $BUILD_APPDIR/rancher-desktop.png
   - mv $BUILD_APPDIR/opt/rancher-desktop/resources/resources/linux/lima/bin/qemu-* $BUILD_APPDIR/usr/bin

diff --git a/pkg/rancher-desktop/assets/dependencies.yaml b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -1,17 +1,17 @@
-lima: 1.0.2.rd1
-qemu: 9.2.0.rd1
+lima: 1.0.2.rd2
+qemu: 9.2.0.rd2
 socketVMNet: 1.2.1
 alpineLimaISO:
   isoVersion: 0.2.41.rd3
   alpineVersion: 3.20.3
 WSLDistro: "0.75"
 kuberlr: 0.5.2
-helm: 3.16.4
-dockerCLI: 27.4.1
+helm: 3.17.0
+dockerCLI: 27.5.0
 dockerBuildx: 0.19.3
-dockerCompose: 2.32.1
+dockerCompose: 2.32.4
 golangci-lint: 1.62.2
-trivy: 0.58.1
+trivy: 0.58.2
 steve: 0.1.0-beta9
 rancherDashboard: desktop-v2.7.0.beta.1
 dockerProvidedCredentialHelpers: 0.8.2
@@ -20,9 +20,8 @@ mobyOpenAPISpec: "1.47"
 wix: v3.14.1
 hostSwitch: 1.2.7
 moproxy: 0.5.1
-spinShim: 0.17.0
+spinShim: 0.18.0
 spinOperator: 0.4.0
-certManager: 1.16.2
-spinCLI: 3.1.1
+certManager: 1.16.3
+spinCLI: 3.1.2
 spinKubePlugin: 0.3.1
-js2wasmPlugin: 0.6.1
diff --git a/pkg/rancher-desktop/backend/lima.ts b/pkg/rancher-desktop/backend/lima.ts
@@ -752,13 +752,24 @@ export default class LimaBackend extends events.EventEmitter implements VMBacken
     const VMNETDir = path.join(VMNET_DIR, 'bin');
     const pathList = (process.env.PATH || '').split(path.delimiter);
     const newPath = [binDir, VMNETDir].concat(...pathList).filter(x => x);
+    const env = structuredClone(process.env);
+
+    env.LIMA_HOME = paths.lima;
+    env.PATH = newPath.join(path.delimiter);
+
+    // Override LD_LIBRARY_PATH to pick up the QEMU libraries.
+    // - on macOS, this is not used. The macOS dynamic linker uses DYLD_ prefixed variables.
+    // - on packaged (rpm/deb) builds, we do not ship this directory, so it does nothing.
+    // - for AppImage this has no effect because the libs are moved to a dir that is already on LD_LIBRARY_PATH
+    // - this only has an effect on builds extracted from a Linux zip file (which includes a bundled
+    //   QEMU) to make sure QEMU dependencies are loaded from the bundled lib directory.
+    if (env.LD_LIBRARY_PATH) {
+      env.LD_LIBRARY_PATH = libDir + path.delimiter + env.LD_LIBRARY_PATH;
+    } else {
+      env.LD_LIBRARY_PATH = libDir;
+    }
 
-    // LD_LIBRARY_PATH is set for running from an extracted Linux zip file, that includes QEMU,
-    // to make sure QEMU dependencies are loaded from the bundled lib directory,
-    // LD_LIBRARY_PATH is ignored on macOS.
-    return {
-      ...process.env, LIMA_HOME: paths.lima, LD_LIBRARY_PATH: libDir, PATH: newPath.join(path.delimiter),
-    };
+    return env;
   }
 
   protected static get qemuImgEnv() {
@@ -1501,9 +1512,8 @@ export default class LimaBackend extends events.EventEmitter implements VMBacken
         const version = semver.parse(DEPENDENCY_VERSIONS.spinCLI);
         const env = {
           ...process.env,
-          KUBE_PLUGIN_VERSION:    DEPENDENCY_VERSIONS.spinKubePlugin,
-          JS2WASM_PLUGIN_VERSION: DEPENDENCY_VERSIONS.js2wasmPlugin,
-          SPIN_TEMPLATE_BRANCH:   (version ? `v${ version.major }.${ version.minor }` : 'main'),
+          KUBE_PLUGIN_VERSION:  DEPENDENCY_VERSIONS.spinKubePlugin,
+          SPIN_TEMPLATE_BRANCH: (version ? `v${ version.major }.${ version.minor }` : 'main'),
         };
 
         promises.push(this.spawnWithCapture(executable('setup-spin'), { env }));

diff --git a/pkg/rancher-desktop/backend/wsl.ts b/pkg/rancher-desktop/backend/wsl.ts
@@ -1345,9 +1345,8 @@ export default class WSLBackend extends events.EventEmitter implements VMBackend
                 try {
                   const version = semver.parse(DEPENDENCY_VERSIONS.spinCLI);
                   const env = {
-                    KUBE_PLUGIN_VERSION:    DEPENDENCY_VERSIONS.spinKubePlugin,
-                    JS2WASM_PLUGIN_VERSION: DEPENDENCY_VERSIONS.js2wasmPlugin,
-                    SPIN_TEMPLATE_BRANCH:   (version ? `v${ version.major }.${ version.minor }` : 'main'),
+                    KUBE_PLUGIN_VERSION:  DEPENDENCY_VERSIONS.spinKubePlugin,
+                    SPIN_TEMPLATE_BRANCH: (version ? `v${ version.major }.${ version.minor }` : 'main'),
                   };
                   const wslenv = Object.keys(env).join(':');
 

diff --git a/pkg/rancher-desktop/integrations/windowsIntegrationManager.ts b/pkg/rancher-desktop/integrations/windowsIntegrationManager.ts
@@ -524,9 +524,8 @@ export default class WindowsIntegrationManager implements IntegrationManager {
     if (state && this.settings.experimental?.containerEngine?.webAssembly) {
       const version = semver.parse(DEPENDENCY_VERSIONS.spinCLI);
       const env = {
-        KUBE_PLUGIN_VERSION:    DEPENDENCY_VERSIONS.spinKubePlugin,
-        JS2WASM_PLUGIN_VERSION: DEPENDENCY_VERSIONS.js2wasmPlugin,
-        SPIN_TEMPLATE_BRANCH:   (version ? `v${ version.major }.${ version.minor }` : 'main'),
+        KUBE_PLUGIN_VERSION:  DEPENDENCY_VERSIONS.spinKubePlugin,
+        SPIN_TEMPLATE_BRANCH: (version ? `v${ version.major }.${ version.minor }` : 'main'),
       };
       const wslenv = Object.keys(env).join(':');
 

diff --git a/resources/k3s-versions.json b/resources/k3s-versions.json
@@ -1,7 +1,7 @@
 {
   "cacheVersion": 2,
   "channels": {
-    "latest": "1.31.4",
+    "latest": "1.32.0",
     "stable": "1.31.4",
     "v1.21": "1.21.14",
     "v1.22": "1.22.17",
@@ -13,7 +13,8 @@
     "v1.28": "1.28.15",
     "v1.29": "1.29.12",
     "v1.30": "1.30.8",
-    "v1.31": "1.31.4"
+    "v1.31": "1.31.4",
+    "v1.32": "1.32.0"
   },
   "versions": [
     "v1.21.0+k3s1",
@@ -167,6 +168,7 @@
     "v1.31.1+k3s1",
     "v1.31.2+k3s1",
     "v1.31.3+k3s1",
-    "v1.31.4+k3s1"
+    "v1.31.4+k3s1",
+    "v1.32.0+k3s1"
   ]
 }
diff --git a/resources/setup-spin b/resources/setup-spin
@@ -53,7 +53,6 @@ install_templates spin "${SPIN_TEMPLATE_BRANCH:-main}"
 install_templates spin-python-sdk main
 install_templates spin-js-sdk main
 
-install_plugin js2wasm "${JS2WASM_PLUGIN_VERSION:-0.6.1}"
 install_plugin kube "${KUBE_PLUGIN_VERSION:-0.3.1}"
 
 echo "'${spin}' setup complete"