From 166797843a857646edc70dbd02036769117b4df9 Mon Sep 17 00:00:00 2001
From: Mark Yen <mark.yen@suse.com>
Date: Thu, 12 Dec 2024 18:00:12 -0800
Subject: [PATCH 01/60] CI: explicitly install pass on Linux as needed

For GitHub hosted runners, Ubuntu 20.x and 22.x had pass pre-installed, but
it was no longer included in the 24.x runners.

Signed-off-by: Mark Yen <mark.yen@suse.com>
---
 .github/actions/setup-environment/action.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/actions/setup-environment/action.yaml b/.github/actions/setup-environment/action.yaml
index 1cdf9b1a691..9c068feca2a 100644
--- a/.github/actions/setup-environment/action.yaml
+++ b/.github/actions/setup-environment/action.yaml
@@ -40,6 +40,9 @@ runs:
     if: runner.os == 'Linux'
     shell: bash
     run: |
+      sudo apt-get update
+      sudo apt-get install pass
+
       # Configure the agent to allow default passwords
       HOMEDIR="$(gpgconf --list-dirs homedir)" # spellcheck-ignore-line
       mkdir -p "${HOMEDIR}"

From b97f88faea88d8d6533f5f83b1d2a36b207bd445 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2024 09:29:04 +0000
Subject: [PATCH 02/60] build(deps-dev): bump sass from 1.82.0 to 1.83.0

Bumps [sass](https://github.com/sass/dart-sass) from 1.82.0 to 1.83.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.82.0...1.83.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 90eab021868..68d8822a5ee 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,7 @@
     "octokit": "3.2.1",
     "ps-tree": "1.2.0",
     "raw-loader": "4.0.2",
-    "sass": "1.82.0",
+    "sass": "1.83.0",
     "sass-loader": "16.0.4",
     "ts-jest": "29.2.5",
     "ts-loader": "^9.5.1",
diff --git a/yarn.lock b/yarn.lock
index 096b94e5cdc..d4253c7b60a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11973,10 +11973,10 @@ sass-resources-loader@^2.2.5:
     glob "^7.1.6"
     loader-utils "^2.0.0"
 
-sass@1.82.0:
-  version "1.82.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.82.0.tgz#30da277af3d0fa6042e9ceabd0d984ed6d07df70"
-  integrity sha512-j4GMCTa8elGyN9A7x7bEglx0VgSpNUG4W4wNedQ33wSMdnkqQCT8HTwOaVSV4e6yQovcu/3Oc4coJP/l0xhL2Q==
+sass@1.83.0:
+  version "1.83.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.0.tgz#e36842c0b88a94ed336fd16249b878a0541d536f"
+  integrity sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==
   dependencies:
     chokidar "^4.0.0"
     immutable "^5.0.2"

From 71542a6e80eb9ae185a3e3d5ec208d43555d2b25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2024 09:34:01 +0000
Subject: [PATCH 03/60] build(deps): bump github/codeql-action from 3.27.7 to
 3.27.9

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.7 to 3.27.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/babb554ede22fd5605947329c4d04d8e7a0b8155...df409f7d9260372bd5f19e5b04e83cb3c43714ae)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql.yaml   | 4 ++--
 .github/workflows/scorecard.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index b44da7b7dd4..b160f3171f3 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -51,7 +51,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
+      uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -79,6 +79,6 @@ jobs:
         exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
+      uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 17fdbc9f470..b7dafdf47f4 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -60,6 +60,6 @@ jobs:
     # Upload the results to GitHub's code scanning dashboard (optional).
     # Commenting out will disable upload of results to your repo's Code Scanning dashboard
     - name: "Upload to code-scanning"
-      uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
+      uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
       with:
         sarif_file: results.sarif

From 071e5043080b9f70483547e3a25d950ffa654473 Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Sat, 14 Dec 2024 08:40:32 +0000
Subject: [PATCH 04/60] Bump dockerCompose from 2.31.0 to 2.32.0

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 6996c2fdd35..ecaae400f0f 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -9,7 +9,7 @@ kuberlr: 0.5.2
 helm: 3.16.3
 dockerCLI: 27.4.0
 dockerBuildx: 0.19.2
-dockerCompose: 2.31.0
+dockerCompose: 2.32.0
 golangci-lint: 1.62.2
 trivy: 0.58.0
 steve: 0.1.0-beta9

From 1896e2848f4ed8e7ada920a1b74ff48e41df8289 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Dec 2024 09:56:55 +0000
Subject: [PATCH 05/60] build(deps): bump marked from 15.0.3 to 15.0.4

Bumps [marked](https://github.com/markedjs/marked) from 15.0.3 to 15.0.4.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v15.0.3...v15.0.4)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 68d8822a5ee..0a61b56543f 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "jsonpath": "1.1.1",
     "linux-ca": "2.0.1",
     "lodash": "4.17.21",
-    "marked": "15.0.3",
+    "marked": "15.0.4",
     "native-reg": "1.1.1",
     "node-fetch": "2.7.0",
     "node-forge": "1.3.1",
diff --git a/yarn.lock b/yarn.lock
index d4253c7b60a..38508c5d426 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9973,10 +9973,10 @@ map-stream@~0.1.0:
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
   integrity sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==
 
-marked@15.0.3:
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-15.0.3.tgz#f75ae6ca71aeeaea0cfa2c2f120016ac8373aede"
-  integrity sha512-Ai0cepvl2NHnTcO9jYDtcOEtVBNVYR31XnEA3BndO7f5As1wzpcOceSUM8FDkNLJNIODcLpDTWay/qQhqbuMvg==
+marked@15.0.4:
+  version "15.0.4"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-15.0.4.tgz#864dbf50227b6507646c771c2ef5f0de2924833e"
+  integrity sha512-TCHvDqmb3ZJ4PWG7VEGVgtefA5/euFmsIhxtD0XsBxI39gUSKL81mIRFdt0AiNQozUahd4ke98ZdirExd/vSEw==
 
 matcher@^3.0.0:
   version "3.0.0"

From 2fabc3424213f26bda715c725d5c39482a14c975 Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Mon, 16 Dec 2024 20:29:19 -0800
Subject: [PATCH 06/60] Create sudoers file internally instead of calling
 `limactl sudoers`

The `limactl sudoers` command will fail if socket_vmnet is not yet
installed into the secure path. So we would need to ask the user for
the sudo password twice: once to install socket_vmnet, and then again
to install the sudoers file. By "guessing" the content beforehand we
can install both at the same time.

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
---
 .github/actions/spelling/expect.txt |   1 +
 pkg/rancher-desktop/backend/lima.ts | 117 +++++++++++++++-------------
 2 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index f54d825bc1c..2ea444b1ca4 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -555,6 +555,7 @@ NONINFRINGEMENT
 noproxy
 norestart
 normaliser
+NOSETENV
 nothrow
 notifempty
 notset
diff --git a/pkg/rancher-desktop/backend/lima.ts b/pkg/rancher-desktop/backend/lima.ts
index c4f6f18687c..11b91efeba6 100644
--- a/pkg/rancher-desktop/backend/lima.ts
+++ b/pkg/rancher-desktop/backend/lima.ts
@@ -13,7 +13,6 @@ import util from 'util';
 import Electron from 'electron';
 import merge from 'lodash/merge';
 import omit from 'lodash/omit';
-import zip from 'lodash/zip';
 import semver from 'semver';
 import tar from 'tar-stream';
 import yaml from 'yaml';
@@ -1195,6 +1194,62 @@ export default class LimaBackend extends events.EventEmitter implements VMBacken
     };
   }
 
+  /**
+   * Create a sudoers file that has to be byte-for-byte identical to what `limactl sudoers` would create.
+   * We can't use `limactl sudoers` because it will fail when socket_vmnet has not yet been installed at
+   * the secure path. We don't want to ask the user twice for a password: once to install socket_vmnet,
+   * and once more to update the sudoers file. So we try to predict what `limactl sudoers` would write.
+   */
+  protected sudoersFile(config: LimaNetworkConfiguration): string {
+    const host = config.networks['host'];
+    const shared = config.networks['rancher-desktop-shared'];
+
+    if (host.mode !== 'host') {
+      throw new Error('host network has wrong type');
+    }
+    if (shared.mode !== 'shared') {
+      throw new Error('shared network has wrong type');
+    }
+
+    let name = 'host';
+    let sudoers = `%everyone ALL=(root:wheel) NOPASSWD:NOSETENV: /bin/mkdir -m 775 -p /private/var/run
+
+# Manage "${ name }" network daemons
+
+%everyone ALL=(root:wheel) NOPASSWD:NOSETENV: \\
+    /opt/rancher-desktop/bin/socket_vmnet --pidfile=/private/var/run/${ name }_socket_vmnet.pid --socket-group=everyone --vmnet-mode=host --vmnet-gateway=${ host.gateway } --vmnet-dhcp-end=${ host.dhcpEnd } --vmnet-mask=${ host.netmask } /private/var/run/socket_vmnet.${ name }, \\
+    /usr/bin/pkill -F /private/var/run/${ name }_socket_vmnet.pid
+
+`;
+
+    const networks = Object.keys(config.networks).sort();
+
+    for (const name of networks) {
+      const prefix = 'rancher-desktop-bridged_';
+
+      if (!name.startsWith(prefix)) {
+        continue;
+      }
+      sudoers += `# Manage "${ name }" network daemons
+
+%everyone ALL=(root:wheel) NOPASSWD:NOSETENV: \\
+    /opt/rancher-desktop/bin/socket_vmnet --pidfile=/private/var/run/${ name }_socket_vmnet.pid --socket-group=everyone --vmnet-mode=bridged --vmnet-interface=${ name.slice(prefix.length) } /private/var/run/socket_vmnet.${ name }, \\
+    /usr/bin/pkill -F /private/var/run/${ name }_socket_vmnet.pid
+
+`;
+    }
+
+    name = 'rancher-desktop-shared';
+    sudoers += `# Manage "${ name }" network daemons
+
+%everyone ALL=(root:wheel) NOPASSWD:NOSETENV: \\
+    /opt/rancher-desktop/bin/socket_vmnet --pidfile=/private/var/run/${ name }_socket_vmnet.pid --socket-group=everyone --vmnet-mode=shared --vmnet-gateway=${ shared.gateway } --vmnet-dhcp-end=${ shared.dhcpEnd } --vmnet-mask=${ shared.netmask } /private/var/run/socket_vmnet.${ name }, \\
+    /usr/bin/pkill -F /private/var/run/${ name }_socket_vmnet.pid
+`;
+
+    return sudoers;
+  }
+
   protected async createLimaSudoersFile(this: Readonly<this> & this, randomTag: string): Promise<SudoCommand | undefined> {
     const paths: string[] = [];
     const commands: string[] = [];
@@ -1210,38 +1265,15 @@ export default class LimaBackend extends events.EventEmitter implements VMBacken
       }
     }
 
-    // We want to generate the file via `limactl sudoers`. However, there are
-    // some limitations:
-    // - The vmnet executables may not be installed yet (because we try to make
-    //   sure the user is only prompted for credentials once).
-    // - `limactl sudoers --check` complains in situations that would be fine:
-    //   - The executable names wouldn't match the installed one.
-    //   - The application directory ("Rancher Desktop.app") contains spaces.
-    // As a workaround, we instead:
-    // 1. Run `limactl sudoers` to generate the desired output, but using the
-    //    executables in the application directory instead of `/opt/...`.
-    // 2. Do a text replace to determine the final sudoers file contents.
-    // 3. Compare the contents with the existing file, and request a write if
-    //    it's not the same.
-
-    // Rewrite the network configuration to use application directory executables.
-    await this.installCustomLimaNetworkConfig(true, true);
-    const { stdout: unsafeSudoers } = await this.limaWithCapture('sudoers');
-    const sudoers = unsafeSudoers.replaceAll(this.unsafeVMNetExecutable, this.safeVMNetExecutable);
+    const networkConfig = await this.installCustomLimaNetworkConfig(true);
+    const sudoers = this.sudoersFile(networkConfig);
     let updateSudoers = false;
 
     try {
-      const existing = await fs.promises.readFile(LIMA_SUDOERS_LOCATION, { encoding: 'utf-8' });
-
-      const expectedLines = sudoers.split(/(?:\r?\n)+/).map(line => line.trim());
-      const actualLines = existing.split(/(?:\r?\n)+/).map(line => line.trim());
+      const existingSudoers = await fs.promises.readFile(LIMA_SUDOERS_LOCATION, { encoding: 'utf-8' });
 
-      for (const [index, [expected, actual]] of Object.entries(zip(expectedLines, actualLines))) {
-        if (expected !== actual) {
-          console.log(`${ LIMA_SUDOERS_LOCATION } mismatch on line ${ index + 1 }:\nexpected ${ expected } \n but got ${ actual }`);
-          updateSudoers = true;
-          break;
-        }
+      if (sudoers !== existingSudoers) {
+        updateSudoers = true;
       }
     } catch (ex: any) {
       if (ex?.code !== 'ENOENT') {
@@ -1260,9 +1292,6 @@ export default class LimaBackend extends events.EventEmitter implements VMBacken
       console.debug(`Sudoers file ${ LIMA_SUDOERS_LOCATION } needs to be updated.`);
     }
 
-    // Rewrite network config again to use the proper executables
-    await this.installCustomLimaNetworkConfig(true, false);
-
     if (commands.length > 0) {
       return {
         reason: 'networking', commands, paths,
@@ -1378,23 +1407,13 @@ export default class LimaBackend extends events.EventEmitter implements VMBacken
     });
   }
 
-  /** Path for the socket_vmnet executable, in the root-owned directory. */
-  protected safeVMNetExecutable = NETWORKS_CONFIG.paths.socketVMNet as string;
-
-  /**
-   * Path for the socket_vmnet executable, from the (user-writeable) application
-   * directory.  We use this temporarily for limactl to generate the sudoers
-   * file, but it is not actually executed from here.
-   */
-  protected unsafeVMNetExecutable = path.join(paths.resources, 'darwin/lima/socket_vmnet/bin/socket_vmnet');
-
   /**
    * Provide a default network config file with rancher-desktop specific settings.
    *
    * If there's an existing file, replace it if it doesn't contain a
    * paths.varRun setting for rancher-desktop
    */
-  protected async installCustomLimaNetworkConfig(allowRoot = true, useUnsafeExecutables = false) {
+  protected async installCustomLimaNetworkConfig(allowRoot = true): Promise<LimaNetworkConfiguration> {
     const networkPath = path.join(paths.lima, '_config', 'networks.yaml');
 
     let config: LimaNetworkConfiguration;
@@ -1415,15 +1434,7 @@ export default class LimaBackend extends events.EventEmitter implements VMBacken
       config = clone(NETWORKS_CONFIG);
     }
 
-    const key = 'socketVMNet';
-
-    if (useUnsafeExecutables) {
-      if (!config.paths[key] || config.paths[key] === this.safeVMNetExecutable) {
-        config.paths[key] = this.unsafeVMNetExecutable;
-      }
-    } else if (!config.paths[key] || config.paths[key] === this.unsafeVMNetExecutable) {
-      config.paths[key] = this.safeVMNetExecutable;
-    }
+    config.paths['socketVMNet'] = '/opt/rancher-desktop/bin/socket_vmnet';
 
     if (config.group === 'staff') {
       config.group = 'everyone';
@@ -1457,6 +1468,8 @@ export default class LimaBackend extends events.EventEmitter implements VMBacken
     }
 
     await fs.promises.writeFile(networkPath, yaml.stringify(config), { encoding: 'utf-8' });
+
+    return config;
   }
 
   /**

From f0976aecadaff8eb7b3f4f61fc295b54821c08b2 Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Tue, 17 Dec 2024 09:22:53 +0000
Subject: [PATCH 07/60] Bump helm from 3.16.3 to 3.16.4

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 ecaae400f0f..529f50e77d8 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -6,7 +6,7 @@ alpineLimaISO:
   alpineVersion: 3.20.3
 WSLDistro: "0.75"
 kuberlr: 0.5.2
-helm: 3.16.3
+helm: 3.16.4
 dockerCLI: 27.4.0
 dockerBuildx: 0.19.2
 dockerCompose: 2.32.0

From 9c05a7b81a0705349bcf589cc2a15be9554d7620 Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Tue, 17 Dec 2024 09:23:00 +0000
Subject: [PATCH 08/60] Bump dockerCompose from 2.32.0 to 2.32.1

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 ecaae400f0f..ac76de59f3a 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -9,7 +9,7 @@ kuberlr: 0.5.2
 helm: 3.16.3
 dockerCLI: 27.4.0
 dockerBuildx: 0.19.2
-dockerCompose: 2.32.0
+dockerCompose: 2.32.1
 golangci-lint: 1.62.2
 trivy: 0.58.0
 steve: 0.1.0-beta9

From 829b9f459ed4811946106147831858eba24e0b23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:46:10 +0000
Subject: [PATCH 09/60] build(deps): bump docker/setup-buildx-action from 3.7.1
 to 3.8.0

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.7.1 to 3.8.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/c47758b77c9736f4b2ef4073d4d51994fabfe349...6524bf65af31da8d45b59e8c27de4bd072b392f5)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/rdx-host-api-tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rdx-host-api-tests.yaml b/.github/workflows/rdx-host-api-tests.yaml
index 8bcbc8a179a..3099bdebba4 100644
--- a/.github/workflows/rdx-host-api-tests.yaml
+++ b/.github/workflows/rdx-host-api-tests.yaml
@@ -17,7 +17,7 @@ jobs:
       with:
         persist-credentials: false
     - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
-    - uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
+    - uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
     - uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
       id: meta
       with:

From 532a949ded20ffd86528f49737fd0da3dfe1397a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:47:06 +0000
Subject: [PATCH 10/60] build(deps): bump google.golang.org/protobuf in
 /src/go/guestagent

Bumps google.golang.org/protobuf from 1.35.2 to 1.36.0.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/go/guestagent/go.mod | 2 +-
 src/go/guestagent/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/go/guestagent/go.mod b/src/go/guestagent/go.mod
index bf29c9dd14d..a719873db05 100644
--- a/src/go/guestagent/go.mod
+++ b/src/go/guestagent/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/sync v0.10.0
 	golang.org/x/sys v0.28.0
-	google.golang.org/protobuf v1.35.2
+	google.golang.org/protobuf v1.36.0
 	k8s.io/api v0.32.0
 	k8s.io/apimachinery v0.32.0
 	k8s.io/client-go v0.32.0
diff --git a/src/go/guestagent/go.sum b/src/go/guestagent/go.sum
index 7fa566d8343..7f2906ff127 100644
--- a/src/go/guestagent/go.sum
+++ b/src/go/guestagent/go.sum
@@ -354,8 +354,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
+google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

From dcf46c54f0ea92418b034af6471ae47cbf8a5bed Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Wed, 18 Dec 2024 00:32:12 -0800
Subject: [PATCH 11/60] Stop installing the js2wasm plugin

The latest Spin JS SDK no longer uses it, and the upstream spin installer
no longer installs it by default: https://github.com/fermyon/developer/pull/1357

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
---
 bats/tests/utils/spin.bats                                   | 2 --
 pkg/rancher-desktop/assets/dependencies.yaml                 | 1 -
 pkg/rancher-desktop/backend/lima.ts                          | 5 ++---
 pkg/rancher-desktop/backend/wsl.ts                           | 5 ++---
 .../integrations/windowsIntegrationManager.ts                | 5 ++---
 resources/setup-spin                                         | 1 -
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/bats/tests/utils/spin.bats b/bats/tests/utils/spin.bats
index 91c5749c400..f56f7263108 100644
--- 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/pkg/rancher-desktop/assets/dependencies.yaml b/pkg/rancher-desktop/assets/dependencies.yaml
index 125396a5154..fe098c95e89 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -25,4 +25,3 @@ spinOperator: 0.4.0
 certManager: 1.16.2
 spinCLI: 3.0.0
 spinKubePlugin: 0.3.1
-js2wasmPlugin: 0.6.1
diff --git a/pkg/rancher-desktop/backend/lima.ts b/pkg/rancher-desktop/backend/lima.ts
index 11b91efeba6..cc752506d0b 100644
--- a/pkg/rancher-desktop/backend/lima.ts
+++ b/pkg/rancher-desktop/backend/lima.ts
@@ -1501,9 +1501,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
index 0778f60d18a..0f0e37edee9 100644
--- 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
index 447f948d7a5..74eb2d1ba6c 100644
--- 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/setup-spin b/resources/setup-spin
index 659ef7f65b0..723abab4b51 100755
--- a/resources/setup-spin
+++ b/resources/setup-spin
@@ -112,7 +112,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"

From a947dda39c8bddc2c7e0baea3f4bb36d3c8c5f2b Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Wed, 18 Dec 2024 09:45:15 +0000
Subject: [PATCH 12/60] Bump dockerBuildx from 0.19.2 to 0.19.3

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 125396a5154..87918e3f860 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -8,7 +8,7 @@ WSLDistro: "0.75"
 kuberlr: 0.5.2
 helm: 3.16.4
 dockerCLI: 27.4.0
-dockerBuildx: 0.19.2
+dockerBuildx: 0.19.3
 dockerCompose: 2.32.1
 golangci-lint: 1.62.2
 trivy: 0.58.0

From 09141f9a28d073e75e9741ccab7dfc796ac05412 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2024 10:00:00 +0000
Subject: [PATCH 13/60] build(deps): bump actions/upload-artifact from 4.4.3 to
 4.5.0

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.3 to 4.5.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4.4.3...6f51ac03b9356f520e9adb1b1b7802705f340c2b)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/bats.yaml                        |  2 +-
 .github/workflows/github-runner-build-image.yaml   |  2 +-
 .github/workflows/github-runner-monitor-build.yaml |  2 +-
 .github/workflows/linux-e2e.yaml                   |  2 +-
 .github/workflows/macM1-e2e.yaml                   |  2 +-
 .github/workflows/package.yaml                     | 12 ++++++------
 .github/workflows/scorecard.yml                    |  2 +-
 .github/workflows/screenshot.yaml                  |  6 +++---
 .github/workflows/smoke-test.yaml                  | 10 +++++-----
 .github/workflows/upgrade-generate.yaml            |  6 +++---
 .github/workflows/windows-e2e.yaml                 |  2 +-
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/bats.yaml b/.github/workflows/bats.yaml
index 980433c2f71..105a140d130 100644
--- a/.github/workflows/bats.yaml
+++ b/.github/workflows/bats.yaml
@@ -318,7 +318,7 @@ jobs:
 
     - name: Upload logs
       if: ${{ !cancelled() }}
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: ${{ steps.log_name.outputs.name }}
         path: logs/
diff --git a/.github/workflows/github-runner-build-image.yaml b/.github/workflows/github-runner-build-image.yaml
index e8c1cdaa94e..10e7e3b19bb 100644
--- a/.github/workflows/github-runner-build-image.yaml
+++ b/.github/workflows/github-runner-build-image.yaml
@@ -24,7 +24,7 @@ jobs:
         sparse-checkout: src/disk-images/github-runner-linux
     - run: ./build-image.sh
       working-directory: src/disk-images/github-runner-linux
-    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+    - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: github-runner-image.qcow2.zip
         path: src/disk-images/github-runner-linux/*.qcow2
diff --git a/.github/workflows/github-runner-monitor-build.yaml b/.github/workflows/github-runner-monitor-build.yaml
index d10276aefe2..c88f6d0600c 100644
--- a/.github/workflows/github-runner-monitor-build.yaml
+++ b/.github/workflows/github-runner-monitor-build.yaml
@@ -31,7 +31,7 @@ jobs:
       env:
         CGO_ENABLED: '0'
         GOWORK: off
-    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+    - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: github-runner-linux
         path: src/go/github-runner-monitor/github-runner-monitor
diff --git a/.github/workflows/linux-e2e.yaml b/.github/workflows/linux-e2e.yaml
index 3061b2c1214..15c59c657f2 100644
--- a/.github/workflows/linux-e2e.yaml
+++ b/.github/workflows/linux-e2e.yaml
@@ -43,7 +43,7 @@ jobs:
           CI: true
         timeout-minutes: 150
       - name: Upload failure reports
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         if: always()
         with:
           name: failure-reports.zip
diff --git a/.github/workflows/macM1-e2e.yaml b/.github/workflows/macM1-e2e.yaml
index 3c6a41b6a10..83eaafb17a8 100644
--- a/.github/workflows/macM1-e2e.yaml
+++ b/.github/workflows/macM1-e2e.yaml
@@ -48,7 +48,7 @@ jobs:
         if: failure()
         run: mkdir -p ./e2e/reports
       - name: Upload Artifacts
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         if: failure()
         with:
           name: e2etest-artifacts
diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index d4c0add1fd2..2a011d30c3a 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -62,42 +62,42 @@ jobs:
       if: matrix.platform == 'linux'
       run: make -C bats bats.tar.gz
     - name: Upload bats.tar.gz
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: matrix.platform == 'linux'
       with:
         name: bats.tar.gz
         path: bats/bats.tar.gz
         if-no-files-found: error
     - name: Upload mac disk image
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: matrix.platform == 'mac'
       with:
         name: Rancher Desktop.${{ matrix.arch }}.dmg
         path: dist/Rancher Desktop*.dmg
         if-no-files-found: error
     - name: Upload mac zip
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: matrix.platform == 'mac'
       with:
         name: Rancher Desktop-mac.${{ matrix.arch }}.zip
         path: dist/Rancher Desktop*.zip
         if-no-files-found: error
     - name: Upload Windows installer
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: matrix.platform == 'win'
       with:
         name: Rancher Desktop Setup.msi
         path: dist/Rancher.Desktop*.msi
         if-no-files-found: error
     - name: Upload Windows zip
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: matrix.platform == 'win'
       with:
         name: Rancher Desktop-win.zip
         path: dist/Rancher Desktop-*-win.zip
         if-no-files-found: error
     - name: Upload Linux zip
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: matrix.platform == 'linux'
       with:
         name: Rancher Desktop-linux.zip
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b7dafdf47f4..ee8c587a7b7 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -51,7 +51,7 @@ jobs:
     # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
     # format to the repository Actions tab.
     - name: "Upload artifact"
-      uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db  # v3.pre.node20
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b  # v3.pre.node20
       with:
         name: SARIF file
         path: results.sarif
diff --git a/.github/workflows/screenshot.yaml b/.github/workflows/screenshot.yaml
index 0cab9b4cd0c..dcf0abc508e 100644
--- a/.github/workflows/screenshot.yaml
+++ b/.github/workflows/screenshot.yaml
@@ -81,13 +81,13 @@ jobs:
         RD_ENV_SCREENSHOT_SLEEP: 5000
         RD_LOGS_DIR: logs
     - name: Upload screenshots
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: screenshots-${{ matrix.platform }}.zip
         path: screenshots/output/
         if-no-files-found: error
     - name: Upload logs
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: always()
       with:
         name: logs-${{ matrix.platform }}.zip
@@ -140,7 +140,7 @@ jobs:
         gm composite -gravity center in/darwin/light/preferences/*_kubernetes.png in/darwin/light/main/*_General.png darwin.png
         gm composite -gravity center in/win32/light/preferences/*_kubernetes.png in/win32/light/main/*_General.png win32.png
         gm convert darwin.png win32.png +append out/getting-started/introduction_preferences_tabKubernetes.png
-    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+    - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: screenshots.zip
         path: out
diff --git a/.github/workflows/smoke-test.yaml b/.github/workflows/smoke-test.yaml
index d41aae78d88..0315ef6ed12 100644
--- a/.github/workflows/smoke-test.yaml
+++ b/.github/workflows/smoke-test.yaml
@@ -52,7 +52,7 @@ jobs:
         GH_TOKEN: ${{ github.token }}
 
     - name: Upload macOS aarch-64 artifacts
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: application-macos-aarch64.zip
         if-no-files-found: error
@@ -60,7 +60,7 @@ jobs:
           *.aarch64.dmg
           *.aarch64.dmg.sha512sum
     - name: Upload macOS x86_64 artifacts
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: application-macos-x86_64.zip
         if-no-files-found: error
@@ -68,7 +68,7 @@ jobs:
           *.x86_64.dmg
           *.x86_64.dmg.sha512sum
     - name: Upload Windows artifacts
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: application-win32.zip
         if-no-files-found: error
@@ -76,7 +76,7 @@ jobs:
           *.msi
           *.msi.sha512sum
     - name: Upload Linux artifacts
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: application-linux.zip
         if-no-files-found: error
@@ -142,7 +142,7 @@ jobs:
     - run: ${{ env.EXEC_COMMAND }} .github/workflows/smoke-test/smoke-test.sh
       shell: bash
     - name: Upload logs
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: always()
       with:
         name: logs-${{ matrix.platform }}.zip
diff --git a/.github/workflows/upgrade-generate.yaml b/.github/workflows/upgrade-generate.yaml
index a5a0009b1ea..a52e293408d 100644
--- a/.github/workflows/upgrade-generate.yaml
+++ b/.github/workflows/upgrade-generate.yaml
@@ -28,7 +28,7 @@ jobs:
     - run: yarn package
     - name: Upload Windows installer
       if: runner.os == 'Windows'
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: Rancher Desktop Setup.msi
         path: dist/Rancher.Desktop*.msi
@@ -37,13 +37,13 @@ jobs:
       run: cat dist/electron-builder.yaml
     - name: Upload Windows build information
       if: runner.os == 'Windows'
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       with:
         name: build-info.yml
         path: dist/electron-builder.yaml
         if-no-files-found: error
     - name: Upload macOS archive
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
       if: matrix.platform == 'mac'
       with:
         name: Rancher Desktop-mac.${{ matrix.arch }}.zip
diff --git a/.github/workflows/windows-e2e.yaml b/.github/workflows/windows-e2e.yaml
index cb9ba293ce6..d8169912c2a 100644
--- a/.github/workflows/windows-e2e.yaml
+++ b/.github/workflows/windows-e2e.yaml
@@ -29,7 +29,7 @@ jobs:
         env:
           RD_DEBUG_ENABLED: '1'
       - name: Upload failure reports
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         if: always()
         with:
           name: e2etest-artifacts

From ea266f0c4d89382c7fa70e8faf3b1ae533b391d9 Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Wed, 18 Dec 2024 19:00:37 +0000
Subject: [PATCH 14/60] Bump dockerCLI from 27.4.0 to 27.4.1

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 b9e8eac7d1c..72a9416f760 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -7,7 +7,7 @@ alpineLimaISO:
 WSLDistro: "0.75"
 kuberlr: 0.5.2
 helm: 3.16.4
-dockerCLI: 27.4.0
+dockerCLI: 27.4.1
 dockerBuildx: 0.19.3
 dockerCompose: 2.32.1
 golangci-lint: 1.62.2

From 1e68b4a36d5ebd1ec80cab8a8dd8142b754412dc Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Thu, 19 Dec 2024 08:51:40 +0000
Subject: [PATCH 15/60] Bump spinCLI from 3.0.0 to 3.1.0

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 72a9416f760..e9322baebf6 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -23,5 +23,5 @@ moproxy: 0.5.1
 spinShim: 0.17.0
 spinOperator: 0.4.0
 certManager: 1.16.2
-spinCLI: 3.0.0
+spinCLI: 3.1.0
 spinKubePlugin: 0.3.1

From c477c8ece086d88de5b0ce8accda506a12e4ec3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2024 09:48:59 +0000
Subject: [PATCH 16/60] build(deps): bump github.com/docker/cli in
 /src/go/rdctl

Bumps [github.com/docker/cli](https://github.com/docker/cli) from 27.4.0+incompatible to 27.4.1+incompatible.
- [Commits](https://github.com/docker/cli/compare/v27.4.0...v27.4.1)

---
updated-dependencies:
- dependency-name: github.com/docker/cli
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/go/rdctl/go.mod | 4 ++--
 src/go/rdctl/go.sum | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/go/rdctl/go.mod b/src/go/rdctl/go.mod
index 621f0ae305a..83516d6efd9 100644
--- a/src/go/rdctl/go.mod
+++ b/src/go/rdctl/go.mod
@@ -4,12 +4,11 @@ go 1.22.0
 
 require (
 	github.com/adrg/xdg v0.5.3
-	github.com/docker/cli v27.4.0+incompatible
+	github.com/docker/cli v27.4.1+incompatible
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af
 	github.com/spf13/cobra v1.8.1
-	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/sys v0.28.0
 	golang.org/x/text v0.21.0
@@ -25,6 +24,7 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gotest.tools/v3 v3.5.1 // indirect
diff --git a/src/go/rdctl/go.sum b/src/go/rdctl/go.sum
index 68fb8e2108c..dc35e1e4060 100644
--- a/src/go/rdctl/go.sum
+++ b/src/go/rdctl/go.sum
@@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docker/cli v27.4.0+incompatible h1:/nJzWkcI1MDMN+U+px/YXnQWJqnu4J+QKGTfD6ptiTc=
-github.com/docker/cli v27.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI=
+github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
 github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=

From 4fd48f4ac299baf18edb7269b19cbc49fbd336b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:05:33 +0000
Subject: [PATCH 17/60] build(deps): bump golang.org/x/net

Bumps the golang-x group in /src/go/networking with 1 update: [golang.org/x/net](https://github.com/golang/net).


Updates `golang.org/x/net` from 0.32.0 to 0.33.0
- [Commits](https://github.com/golang/net/compare/v0.32.0...v0.33.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/go/networking/go.mod | 4 ++--
 src/go/networking/go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/go/networking/go.mod b/src/go/networking/go.mod
index 6d8f52356d1..316696cc987 100644
--- a/src/go/networking/go.mod
+++ b/src/go/networking/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/vishvananda/netlink v1.3.0
 	github.com/vishvananda/netns v0.0.5
-	golang.org/x/net v0.32.0
+	golang.org/x/net v0.33.0
 	golang.org/x/sync v0.10.0
 	golang.org/x/sys v0.28.0
 	gvisor.dev/gvisor v0.0.0-20240916094835-a174eb65023f
@@ -42,7 +42,7 @@ require (
 	github.com/qdm12/gosettings v0.4.1 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
-	golang.org/x/crypto v0.30.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/mod v0.21.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
diff --git a/src/go/networking/go.sum b/src/go/networking/go.sum
index c1199b1cf4a..b669fead6f6 100644
--- a/src/go/networking/go.sum
+++ b/src/go/networking/go.sum
@@ -85,8 +85,8 @@ github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zd
 github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
-golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
@@ -95,8 +95,8 @@ golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
 golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=

From 2b18eebc41f7cb4fa97e687ea62d0614713ed01e Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Thu, 19 Dec 2024 10:13:02 +0000
Subject: [PATCH 18/60] Update go modules

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 src/go/docker-credential-none/go.mod | 2 +-
 src/go/docker-credential-none/go.sum | 4 ++--
 src/go/rdctl/go.mod                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/go/docker-credential-none/go.mod b/src/go/docker-credential-none/go.mod
index f63b60fde90..76116925052 100644
--- a/src/go/docker-credential-none/go.mod
+++ b/src/go/docker-credential-none/go.mod
@@ -3,7 +3,7 @@ module github.com/rancher-sandbox/rancher-desktop/src/go/docker-credential-none
 go 1.22.0
 
 require (
-	github.com/docker/cli v27.4.0+incompatible
+	github.com/docker/cli v27.4.1+incompatible
 	github.com/docker/docker-credential-helpers v0.8.2
 )
 
diff --git a/src/go/docker-credential-none/go.sum b/src/go/docker-credential-none/go.sum
index 21e33ca239d..64647629bba 100644
--- a/src/go/docker-credential-none/go.sum
+++ b/src/go/docker-credential-none/go.sum
@@ -2,8 +2,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docker/cli v27.4.0+incompatible h1:/nJzWkcI1MDMN+U+px/YXnQWJqnu4J+QKGTfD6ptiTc=
-github.com/docker/cli v27.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI=
+github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
 github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
diff --git a/src/go/rdctl/go.mod b/src/go/rdctl/go.mod
index 83516d6efd9..074b18fa4c4 100644
--- a/src/go/rdctl/go.mod
+++ b/src/go/rdctl/go.mod
@@ -9,6 +9,7 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af
 	github.com/spf13/cobra v1.8.1
+	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/sys v0.28.0
 	golang.org/x/text v0.21.0
@@ -24,7 +25,6 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gotest.tools/v3 v3.5.1 // indirect

From 5d631fa76a8e517a637a56f8d5be7f5528d66753 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:24:05 +0000
Subject: [PATCH 19/60] build(deps): bump github.com/docker/docker in
 /src/go/guestagent

Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.4.0+incompatible to 27.4.1+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](https://github.com/docker/docker/compare/v27.4.0...v27.4.1)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/go/guestagent/go.mod | 2 +-
 src/go/guestagent/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/go/guestagent/go.mod b/src/go/guestagent/go.mod
index a719873db05..4f8d4d0c5c0 100644
--- a/src/go/guestagent/go.mod
+++ b/src/go/guestagent/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/containerd/containerd/api v1.8.0
 	github.com/containernetworking/plugins v1.6.1
 	github.com/containers/gvisor-tap-vsock v0.8.1
-	github.com/docker/docker v27.4.0+incompatible
+	github.com/docker/docker v27.4.1+incompatible
 	github.com/docker/go-connections v0.5.0
 	github.com/lima-vm/lima v1.0.2
 	github.com/stretchr/testify v1.10.0
diff --git a/src/go/guestagent/go.sum b/src/go/guestagent/go.sum
index 7f2906ff127..8a8aa1c8345 100644
--- a/src/go/guestagent/go.sum
+++ b/src/go/guestagent/go.sum
@@ -54,8 +54,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v27.4.0+incompatible h1:I9z7sQ5qyzO0BfAb9IMOawRkAGxhYsidKiTMcm0DU+A=
-github.com/docker/docker v27.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4=
+github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=

From 8ec34b7a90bcebe250008a34d9c57796130c4aaf Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Thu, 19 Dec 2024 10:27:39 +0000
Subject: [PATCH 20/60] Update go modules

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 src/go/guestagent/go.mod | 2 +-
 src/go/guestagent/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/go/guestagent/go.mod b/src/go/guestagent/go.mod
index a719873db05..366400cf106 100644
--- a/src/go/guestagent/go.mod
+++ b/src/go/guestagent/go.mod
@@ -88,7 +88,7 @@ require (
 	go.opentelemetry.io/otel v1.28.0 // indirect
 	go.opentelemetry.io/otel/metric v1.28.0 // indirect
 	go.opentelemetry.io/otel/trace v1.28.0 // indirect
-	golang.org/x/net v0.32.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/term v0.27.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
diff --git a/src/go/guestagent/go.sum b/src/go/guestagent/go.sum
index 7f2906ff127..64384e015c9 100644
--- a/src/go/guestagent/go.sum
+++ b/src/go/guestagent/go.sum
@@ -270,8 +270,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=

From 6a7a7f5ceeff5a2ef294e17164210ef44dda86f0 Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Thu, 19 Dec 2024 11:21:08 -0800
Subject: [PATCH 21/60] Spin 3.1 can install directly from a remote tarball

Ref https://github.com/fermyon/spin/pull/2957

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
---
 resources/setup-spin | 63 ++------------------------------------------
 1 file changed, 2 insertions(+), 61 deletions(-)

diff --git a/resources/setup-spin b/resources/setup-spin
index 723abab4b51..fb028411966 100755
--- a/resources/setup-spin
+++ b/resources/setup-spin
@@ -7,14 +7,10 @@ resources_dir=$(dirname "$0")
 
 # We run setup-spin in the rancher-desktop distro to setup spin on the Win32 host.
 if [ "${WSL_DISTRO_NAME:-}" = "rancher-desktop" ]; then
-  app_data_dir=$(/bin/wslpath "$(powershell.exe -Command "Write-Output \${Env:LOCALAPPDATA}")" | tr -d "\r")
-  system_root=$(/bin/wslpath "$(powershell.exe -Command "Write-Output \${Env:SystemRoot}")" | tr -d "\r")
   spin="${resources_dir}/win32/bin/spin.exe"
 elif [ "$(uname)" = "Linux" ]; then
-  app_data_dir="${XDG_DATA_HOME:-$HOME/.local/share}"
   spin="${resources_dir}/linux/bin/spin"
 else
-  app_data_dir="${HOME}/Library/Application Support"
   spin="${resources_dir}/darwin/bin/spin"
 fi
 
@@ -23,10 +19,6 @@ if [ ! -x "$spin" ]; then
   exit 1
 fi
 
-# This is the WSL path, not the Win32 path, so we can't use it to set SPIN_DATA_DIR.
-# We rely on the spin/spin.exe wrapper to setup SPIN_DATA_DIR and use spin_dir only for temp files.
-spin_dir="${app_data_dir}/rancher-desktop/spin"
-
 if [ "${WSL_DISTRO_NAME:-}" = "rancher-desktop" ]; then
   echo "Waiting for github.com to become resolvable"
   for _ in $(seq 30); do
@@ -39,64 +31,13 @@ if [ "${WSL_DISTRO_NAME:-}" = "rancher-desktop" ]; then
   done
 fi
 
-# The reason for this complexity is to be able to run on systems without git.
-# We do need either curl or wget to be on the PATH though.
 install_templates() {
   repo=$1
   branch=$2
-  tmpdir="${spin_dir}/rancher-desktop.$$"
-  tarball="${tmpdir}/${repo}.tar.gz"
 
+  echo "Installing templates ${repo} from branch ${branch}"
   url="https://github.com/fermyon/${repo}/archive/refs/heads/${branch}.tar.gz"
-
-  if [ "${WSL_DISTRO_NAME:-}" = "rancher-desktop" ]; then
-    # Download and extract tarball on Win32 host side to avoid 9p syncing issues
-    tmpdir=$(/bin/wslpath -w "$tmpdir")
-    tarball=$(/bin/wslpath -w "$tarball")
-
-    "${system_root}/system32/cmd.exe" /c mkdir "$tmpdir"
-
-    echo "Downloading '${url}' to '${tarball}' with curl.exe"
-    "${system_root}/system32/curl.exe" --silent --location "$url" --output "$tarball"
-    rc=$?; test $rc -ne 0 && echo "curl.exe exit status is $rc"
-
-    if [ $rc -eq 0 ]; then
-      echo "Unpacking '${tarball}'"
-      "${system_root}/system32/tar.exe" xfz "$tarball" -C "$tmpdir" --strip-components 1
-      rc=$?; test $rc -ne 0 && echo "tar.exe exit status is $rc"
-
-      echo "Installing templates from '${tmpdir}'"
-      "$spin" templates install --update --dir "$tmpdir"
-      rc=$?; test $rc -ne 0 && echo "Exit status is $rc"
-    else
-      echo "Could not download '${url}'"
-    fi
-    "${system_root}/system32/cmd.exe" /c rmdir /s /q "$tmpdir"
-    return
-  fi
-
-  mkdir -p "$tmpdir"
-  if command -v curl >/dev/null; then
-    echo "Downloading '${url}' to '${tarball}' with curl"
-    curl --silent --location "$url" --output "$tarball"
-    rc=$?; test $rc -ne 0 && echo "curl exit status is $rc"
-  elif command -v wget >/dev/null; then
-    echo "Downloading '${url}' to '${tarball}' with wget"
-    wget --no-verbose "$url" -O "$tarball"
-    rc=$?; test $rc -ne 0 && echo "wget exit status is $rc"
-  fi
-  if [ -f "$tarball" ]; then
-    echo "Unpacking '${tarball}'"
-    tar xfz "$tarball" -C "$tmpdir" --strip-components 1
-    rc=$?; test $rc -ne 0 && echo "tar exit status is $rc"
-
-    echo "Installing templates from '${tmpdir}'"
-    "$spin" templates install --update --dir "$tmpdir"
-    rc=$?; test $rc -ne 0 && echo "Exit status is $rc"
-  else
-    echo "Could not download '${url}' (maybe no curl/wget)"
-  fi
-  rm -rf "$tmpdir"
+  "$spin" templates install --update --tar "$url"
 }
 
 install_plugin() {

From c2b02b03d47eb2413ec93da5d636b07e0e5045cd Mon Sep 17 00:00:00 2001
From: Mark Yen <mark.yen@suse.com>
Date: Thu, 19 Dec 2024 15:08:16 -0800
Subject: [PATCH 22/60] packaging: win32: Move signingHashAlgorithms to
 signtoolOptions

The field has moved in electron-builder 25.1.7 and the old location was
deprecated.

Signed-off-by: Mark Yen <mark.yen@suse.com>
---
 packaging/electron-builder.yml | 3 ++-
 scripts/lib/sign-win32.ts      | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packaging/electron-builder.yml b/packaging/electron-builder.yml
index 38aee3ce493..b22e241b12e 100644
--- a/packaging/electron-builder.yml
+++ b/packaging/electron-builder.yml
@@ -35,7 +35,8 @@ mac:
   - { from: dist/electron-builder.yaml, to: electron-builder.yml }
 win:
   target: [ zip ]
-  signingHashAlgorithms: [ sha256 ] # We only support Windows 10 + WSL2
+  signtoolOptions:
+    signingHashAlgorithms: [ sha256 ] # We only support Windows 10 + WSL2
   requestedExecutionLevel: asInvoker # The _app_ doesn't need privileges
   extraFiles:
   - build/wix/*
diff --git a/scripts/lib/sign-win32.ts b/scripts/lib/sign-win32.ts
index 0b67f2c3e2a..e263d3d7664 100644
--- a/scripts/lib/sign-win32.ts
+++ b/scripts/lib/sign-win32.ts
@@ -7,6 +7,7 @@ import path from 'path';
 
 import { getSignVendorPath } from 'app-builder-lib/out/codeSign/windowsSignToolManager';
 import defaults from 'lodash/defaultsDeep';
+import merge from 'lodash/merge';
 import yaml from 'yaml';
 
 import { simpleSpawn } from 'scripts/simple_process';
@@ -21,8 +22,8 @@ type signFileFn = (...filePath: string[]) => Promise<void>;
  * when signing the installer.
  */
 const REQUIRED_WINDOWS_CONFIG = {
-  signingHashAlgorithms: ['sha256'],
-  target:                'zip',
+  signtoolOptions: { signingHashAlgorithms: ['sha256'] },
+  target:          'zip',
 };
 
 /**
@@ -66,7 +67,7 @@ export async function sign(workDir: string): Promise<string[]> {
 
   config.win ??= {};
   defaults(config.win, DEFAULT_WINDOWS_CONFIG);
-  Object.assign(config.win, REQUIRED_WINDOWS_CONFIG);
+  merge(config.win, REQUIRED_WINDOWS_CONFIG);
   config.win.certificateSha1 = certFingerprint;
 
   const toolPath = path.join(await getSignVendorPath(), 'windows-10', process.arch, 'signtool.exe');

From 9652d2bcf7483b9e329ef967e559128bc03acfe2 Mon Sep 17 00:00:00 2001
From: Mark Yen <mark.yen@suse.com>
Date: Wed, 18 Dec 2024 12:43:31 -0800
Subject: [PATCH 23/60] WSL: Ignore errors when shutting down

When shutting down, ignore errors taking down the individual services or
when killing network-setup.  Since we will terminate the WSL distribution
anyway, any errors at that stage are harmless.

This appears to fix issues with Windows E2E tests; it seems like we end up
falling over trying to shut down and disrupt the following test step.

Signed-off-by: Mark Yen <mark.yen@suse.com>
---
 pkg/rancher-desktop/backend/wsl.ts | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkg/rancher-desktop/backend/wsl.ts b/pkg/rancher-desktop/backend/wsl.ts
index 0f0e37edee9..6706a577ed4 100644
--- a/pkg/rancher-desktop/backend/wsl.ts
+++ b/pkg/rancher-desktop/backend/wsl.ts
@@ -1588,12 +1588,17 @@ export default class WSLBackend extends events.EventEmitter implements VMBackend
 
       await this.progressTracker.action('Shutting Down...', 10, async() => {
         if (await this.isDistroRegistered({ runningOnly: true })) {
-          await this.stopService('k3s');
-          await this.stopService('docker');
-          await this.stopService('containerd');
-          await this.stopService('rd-openresty');
-          await this.stopService('rancher-desktop-guestagent');
-          await this.stopService('buildkitd');
+          const services = ['k3s', 'docker', 'containerd', 'rd-openresty',
+            'rancher-desktop-guestagent', 'buildkitd'];
+
+          for (const service of services) {
+            try {
+              await this.stopService(service);
+            } catch (ex) {
+              // Do not allow errors here to prevent us from stopping.
+              console.error(`Failed to stop service ${ service }:`, ex);
+            }
+          }
           try {
             await this.stopService('local');
           } catch (ex) {
@@ -1606,7 +1611,14 @@ export default class WSLBackend extends events.EventEmitter implements VMBackend
         this.process = null;
         if (initProcess) {
           initProcess.kill('SIGTERM');
-          await this.execCommand('/usr/bin/killall', '-q', '/usr/local/bin/network-setup');
+          try {
+            await this.execCommand({ expectFailure: true }, '/usr/bin/killall', '/usr/local/bin/network-setup');
+          } catch (ex) {
+            // `killall` returns failure if it fails to kill (e.g. if the
+            // process does not exist); `-q` only suppresses printing any error
+            // messages.
+            console.error('Ignoring error shutting down network-setup:', ex);
+          }
         }
         await this.hostSwitchProcess.stop();
         if (await this.isDistroRegistered({ runningOnly: true })) {

From 03482c124fe0ffa16819c49c648879acca2af4c3 Mon Sep 17 00:00:00 2001
From: Mark Yen <mark.yen@suse.com>
Date: Thu, 19 Dec 2024 15:52:19 -0800
Subject: [PATCH 24/60] WSL: network-setup: improve logging

This just updates the logging to make it easier for debugging.  No
functional change.

Signed-off-by: Mark Yen <mark.yen@suse.com>
---
 src/go/networking/cmd/network/setup_linux.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/go/networking/cmd/network/setup_linux.go b/src/go/networking/cmd/network/setup_linux.go
index edbad049b9d..5a7c636bb0d 100644
--- a/src/go/networking/cmd/network/setup_linux.go
+++ b/src/go/networking/cmd/network/setup_linux.go
@@ -144,13 +144,15 @@ func main() {
 		logrus.Fatalf("failed to switch back to original namespace: %v", err)
 	}
 	if err := configureVethPair(WSLVeth, WSLVethIP); err != nil {
-		logrus.Fatalf("failed setting up veth: %s for rancher desktop namespace: %v", WSLVeth, err)
+		logrus.Fatalf("failed setting up veth: %s for default namespace: %v", WSLVeth, err)
 	}
 
 	if err := originNS.Close(); err != nil {
 		logrus.Errorf("failed to close original NS, ignoring error: %v", err)
 	}
 
+	logrus.Trace("Network setup complete, waiting for vm-switch")
+
 	if err := vmSwitchCmd.Wait(); err != nil {
 		logrus.Errorf("vm-switch exited with error: %v", err)
 	}

From 8e80c8a9869bc38dbde3ee4bee64c7e99e527a0e Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Fri, 20 Dec 2024 01:20:33 +0000
Subject: [PATCH 25/60] Bump alpineLimaISO from 0.2.41.rd3 to 0.2.41.rd4

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 e9322baebf6..aa9fc136f2d 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -2,7 +2,7 @@ lima: 1.0.2.rd1
 qemu: 9.1.2.rd1
 socketVMNet: 1.2.1
 alpineLimaISO:
-  isoVersion: 0.2.41.rd3
+  isoVersion: 0.2.41.rd4
   alpineVersion: 3.20.3
 WSLDistro: "0.75"
 kuberlr: 0.5.2

From 718aded20af834d202524ae046e5e3fc1262bf59 Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Fri, 20 Dec 2024 01:20:34 +0000
Subject: [PATCH 26/60] Bump WSLDistro from 0.75 to 0.76

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 e9322baebf6..97e3ca9c44a 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -4,7 +4,7 @@ socketVMNet: 1.2.1
 alpineLimaISO:
   isoVersion: 0.2.41.rd3
   alpineVersion: 3.20.3
-WSLDistro: "0.75"
+WSLDistro: "0.76"
 kuberlr: 0.5.2
 helm: 3.16.4
 dockerCLI: 27.4.1

From d5daac5eb5e8a90d05efb4ebde1801d80f1f5c4e Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Fri, 20 Dec 2024 10:37:26 -0800
Subject: [PATCH 27/60] Delete session data on factory-reset

This will be for left-over session data from previous releases;
we'll move the session data below our appdata directory.

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
---
 background.ts                                          | 1 +
 src/go/rdctl/pkg/factoryreset/delete_data_darwin.go    | 1 +
 src/go/rdctl/pkg/factoryreset/delete_data_linux.go     | 1 +
 src/go/rdctl/pkg/factoryreset/factory_reset_windows.go | 1 +
 src/go/rdctl/pkg/paths/paths.go                        | 3 +++
 src/go/rdctl/pkg/paths/paths_darwin.go                 | 1 +
 src/go/rdctl/pkg/paths/paths_darwin_test.go            | 2 ++
 src/go/rdctl/pkg/paths/paths_linux.go                  | 1 +
 src/go/rdctl/pkg/paths/paths_linux_test.go             | 2 ++
 src/go/rdctl/pkg/paths/paths_windows.go                | 1 +
 src/go/rdctl/pkg/paths/paths_windows_test.go           | 2 ++
 11 files changed, 16 insertions(+)

diff --git a/background.ts b/background.ts
index 92dfe589848..665a8defda6 100644
--- a/background.ts
+++ b/background.ts
@@ -56,6 +56,7 @@ import * as window from '@pkg/window';
 import { closeDashboard, openDashboard } from '@pkg/window/dashboard';
 import { openPreferences, preferencesSetDirtyFlag } from '@pkg/window/preferences';
 
+Electron.app.setPath('userData', path.join(paths.appHome, 'electron'));
 Electron.app.setPath('cache', paths.cache);
 Electron.app.setAppLogsPath(paths.logs);
 
diff --git a/src/go/rdctl/pkg/factoryreset/delete_data_darwin.go b/src/go/rdctl/pkg/factoryreset/delete_data_darwin.go
index f644108d5f2..d433c60a4c1 100644
--- a/src/go/rdctl/pkg/factoryreset/delete_data_darwin.go
+++ b/src/go/rdctl/pkg/factoryreset/delete_data_darwin.go
@@ -25,6 +25,7 @@ func DeleteData(ctx context.Context, appPaths paths.Paths, removeKubernetesCache
 		appPaths.Config,
 		appPaths.Logs,
 		appPaths.ExtensionRoot,
+		appPaths.OldUserData,
 	}
 	pathList = append(pathList, appHomeDirectories(appPaths)...)
 
diff --git a/src/go/rdctl/pkg/factoryreset/delete_data_linux.go b/src/go/rdctl/pkg/factoryreset/delete_data_linux.go
index 13003e7a9ce..b9e14990bda 100644
--- a/src/go/rdctl/pkg/factoryreset/delete_data_linux.go
+++ b/src/go/rdctl/pkg/factoryreset/delete_data_linux.go
@@ -29,6 +29,7 @@ func DeleteData(ctx context.Context, appPaths paths.Paths, removeKubernetesCache
 		appPaths.AltAppHome,
 		appPaths.Config,
 		appPaths.Logs,
+		appPaths.OldUserData,
 		filepath.Join(homeDir, ".local", "state", "rancher-desktop"),
 	}
 
diff --git a/src/go/rdctl/pkg/factoryreset/factory_reset_windows.go b/src/go/rdctl/pkg/factoryreset/factory_reset_windows.go
index 4f46e127fd5..9b71d173aa3 100644
--- a/src/go/rdctl/pkg/factoryreset/factory_reset_windows.go
+++ b/src/go/rdctl/pkg/factoryreset/factory_reset_windows.go
@@ -170,5 +170,6 @@ func getDirectoriesToDelete(keepSystemImages bool, appName string) ([]string, er
 	} else {
 		logrus.Errorf("Could not get AppData (roaming) folder: %s\n", err)
 	}
+	// The OldUserData directory is already deleted by deleting the Cache directory.
 	return dirs, nil
 }
diff --git a/src/go/rdctl/pkg/paths/paths.go b/src/go/rdctl/pkg/paths/paths.go
index 4543367e112..d8da355b374 100644
--- a/src/go/rdctl/pkg/paths/paths.go
+++ b/src/go/rdctl/pkg/paths/paths.go
@@ -41,6 +41,9 @@ type Paths struct {
 	Snapshots string `json:"snapshots,omitempty"`
 	// Directory containing user-managed containerd-shims
 	ContainerdShims string `json:"containerdShims,omitempty"`
+	// Previous location of Electron user data (e.g. cookies) up to Rancher Desktop 1.16.
+	// Current location is `$AppHome/electron` and does not need special treatment.
+	OldUserData string `json:"oldUserData,omitempty"`
 }
 
 var rdctlPathOverride string
diff --git a/src/go/rdctl/pkg/paths/paths_darwin.go b/src/go/rdctl/pkg/paths/paths_darwin.go
index dba393f6a6c..1d4bd033754 100644
--- a/src/go/rdctl/pkg/paths/paths_darwin.go
+++ b/src/go/rdctl/pkg/paths/paths_darwin.go
@@ -40,6 +40,7 @@ func GetPaths(getResourcesPathFuncs ...func() (string, error)) (Paths, error) {
 		ExtensionRoot:           filepath.Join(appHome, "extensions"),
 		Snapshots:               filepath.Join(appHome, "snapshots"),
 		ContainerdShims:         filepath.Join(appHome, "containerd-shims"),
+		OldUserData:             filepath.Join(homeDir, "Library", "Application Support", "Rancher Desktop"),
 	}
 	paths.Logs = os.Getenv("RD_LOGS_DIR")
 	if paths.Logs == "" {
diff --git a/src/go/rdctl/pkg/paths/paths_darwin_test.go b/src/go/rdctl/pkg/paths/paths_darwin_test.go
index 3dec9876f9f..bbc62c2b200 100644
--- a/src/go/rdctl/pkg/paths/paths_darwin_test.go
+++ b/src/go/rdctl/pkg/paths/paths_darwin_test.go
@@ -33,6 +33,7 @@ func TestGetPaths(t *testing.T) {
 			ExtensionRoot:           filepath.Join(homeDir, "Library", "Application Support", appName, "extensions"),
 			Snapshots:               filepath.Join(homeDir, "Library", "Application Support", appName, "snapshots"),
 			ContainerdShims:         filepath.Join(homeDir, "Library", "Application Support", appName, "containerd-shims"),
+			OldUserData:             filepath.Join(homeDir, "Library", "Application Support", "Rancher Desktop"),
 		}
 		actualPaths, err := GetPaths(mockGetResourcesPath)
 		if err != nil {
@@ -64,6 +65,7 @@ func TestGetPaths(t *testing.T) {
 			ExtensionRoot:           filepath.Join(homeDir, "Library", "Application Support", appName, "extensions"),
 			Snapshots:               filepath.Join(homeDir, "Library", "Application Support", appName, "snapshots"),
 			ContainerdShims:         filepath.Join(homeDir, "Library", "Application Support", appName, "containerd-shims"),
+			OldUserData:             filepath.Join(homeDir, "Library", "Application Support", "Rancher Desktop"),
 		}
 		actualPaths, err := GetPaths(mockGetResourcesPath)
 		if err != nil {
diff --git a/src/go/rdctl/pkg/paths/paths_linux.go b/src/go/rdctl/pkg/paths/paths_linux.go
index be4f9cc41c1..b766976a73a 100644
--- a/src/go/rdctl/pkg/paths/paths_linux.go
+++ b/src/go/rdctl/pkg/paths/paths_linux.go
@@ -51,6 +51,7 @@ func GetPaths(getResourcesPathFuncs ...func() (string, error)) (Paths, error) {
 		ExtensionRoot:           filepath.Join(dataHome, appName, "extensions"),
 		Snapshots:               filepath.Join(dataHome, appName, "snapshots"),
 		ContainerdShims:         filepath.Join(dataHome, appName, "containerd-shims"),
+		OldUserData:             filepath.Join(configHome, "Rancher Desktop"),
 	}
 	paths.Logs = os.Getenv("RD_LOGS_DIR")
 	if paths.Logs == "" {
diff --git a/src/go/rdctl/pkg/paths/paths_linux_test.go b/src/go/rdctl/pkg/paths/paths_linux_test.go
index 469f2e04f3a..1e3adbba83b 100644
--- a/src/go/rdctl/pkg/paths/paths_linux_test.go
+++ b/src/go/rdctl/pkg/paths/paths_linux_test.go
@@ -43,6 +43,7 @@ func TestGetPaths(t *testing.T) {
 			ExtensionRoot:           filepath.Join(homeDir, ".local/share", appName, "extensions"),
 			Snapshots:               filepath.Join(homeDir, ".local/share", appName, "snapshots"),
 			ContainerdShims:         filepath.Join(homeDir, ".local/share", appName, "containerd-shims"),
+			OldUserData:             filepath.Join(homeDir, ".config", "Rancher Desktop"),
 		}
 		actualPaths, err := GetPaths(mockGetResourcesPath)
 		if err != nil {
@@ -82,6 +83,7 @@ func TestGetPaths(t *testing.T) {
 			ExtensionRoot:           filepath.Join(environment["XDG_DATA_HOME"], appName, "extensions"),
 			Snapshots:               filepath.Join(environment["XDG_DATA_HOME"], appName, "snapshots"),
 			ContainerdShims:         filepath.Join(environment["XDG_DATA_HOME"], appName, "containerd-shims"),
+			OldUserData:             filepath.Join(environment["XDG_CONFIG_HOME"], "Rancher Desktop"),
 		}
 		actualPaths, err := GetPaths(mockGetResourcesPath)
 		if err != nil {
diff --git a/src/go/rdctl/pkg/paths/paths_windows.go b/src/go/rdctl/pkg/paths/paths_windows.go
index 49cc4dd5de9..33675313e4d 100644
--- a/src/go/rdctl/pkg/paths/paths_windows.go
+++ b/src/go/rdctl/pkg/paths/paths_windows.go
@@ -42,6 +42,7 @@ func GetPaths(getResourcesPathFuncs ...func() (string, error)) (Paths, error) {
 		ExtensionRoot:   filepath.Join(localAppData, appName, "extensions"),
 		Snapshots:       filepath.Join(localAppData, appName, "snapshots"),
 		ContainerdShims: filepath.Join(localAppData, appName, "containerd-shims"),
+		OldUserData:     filepath.Join(localAppData, appName, "cache", "Rancher Desktop"),
 	}
 	paths.Logs = os.Getenv("RD_LOGS_DIR")
 	if paths.Logs == "" {
diff --git a/src/go/rdctl/pkg/paths/paths_windows_test.go b/src/go/rdctl/pkg/paths/paths_windows_test.go
index 7bc2e3a7a27..2a63248f664 100644
--- a/src/go/rdctl/pkg/paths/paths_windows_test.go
+++ b/src/go/rdctl/pkg/paths/paths_windows_test.go
@@ -40,6 +40,7 @@ func TestGetPaths(t *testing.T) {
 			ExtensionRoot:   filepath.Join(homeDir, "AppData", "Local", appName, "extensions"),
 			Snapshots:       filepath.Join(homeDir, "AppData", "Local", appName, "snapshots"),
 			ContainerdShims: filepath.Join(homeDir, "AppData", "Local", appName, "containerd-shims"),
+			OldUserData:     filepath.Join(homeDir, "AppData", "Local", appName, "cache", "Rancher Desktop"),
 		}
 		actualPaths, err := GetPaths(mockGetResourcesPath)
 		if err != nil {
@@ -76,6 +77,7 @@ func TestGetPaths(t *testing.T) {
 			ExtensionRoot:   filepath.Join(environment["LOCALAPPDATA"], appName, "extensions"),
 			Snapshots:       filepath.Join(environment["LOCALAPPDATA"], appName, "snapshots"),
 			ContainerdShims: filepath.Join(environment["LOCALAPPDATA"], appName, "containerd-shims"),
+			OldUserData:     filepath.Join(environment["LOCALAPPDATA"], appName, "cache", "Rancher Desktop"),
 		}
 		actualPaths, err := GetPaths(mockGetResourcesPath)
 		if err != nil {

From d469c46dfb039198d0f7664352df46f440c5db69 Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Fri, 20 Dec 2024 22:00:32 +0000
Subject: [PATCH 28/60] Bump qemu from 9.1.2.rd1 to 9.2.0.rd1

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 7a7a3e83c58..c3cb8de80de 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -1,5 +1,5 @@
 lima: 1.0.2.rd1
-qemu: 9.1.2.rd1
+qemu: 9.2.0.rd1
 socketVMNet: 1.2.1
 alpineLimaISO:
   isoVersion: 0.2.41.rd4

From ed950ac902603c44851f5efda67f2208c3ac0140 Mon Sep 17 00:00:00 2001
From: Gunasekhar Matamalam <gunasekhar.matamalam@suse.com>
Date: Fri, 20 Dec 2024 15:30:56 -0800
Subject: [PATCH 29/60] Bumped the OI extension version to v0.0.2

Signed-off-by: Gunasekhar Matamalam <gunasekhar.matamalam@suse.com>
---
 pkg/rancher-desktop/utils/_demo_marketplace_items.js | 2 +-
 pkg/rancher-desktop/utils/_demo_metadata.js          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/rancher-desktop/utils/_demo_marketplace_items.js b/pkg/rancher-desktop/utils/_demo_marketplace_items.js
index d5bb6546626..aec2edf6221 100644
--- a/pkg/rancher-desktop/utils/_demo_marketplace_items.js
+++ b/pkg/rancher-desktop/utils/_demo_marketplace_items.js
@@ -8,7 +8,7 @@ export const demoMarketplace = {
       type:                  'extension',
       publisher:             { name: 'SUSE LLC' },
       created_at:            '2024-10-03T15:43:34Z',
-      updated_at:            '2024-11-28T19:17:26.91232165Z',
+      updated_at:            '2024-12-20T23:13:59.937900634Z',
       short_description:     'Open WebUI and Ollama packaged into an extension for local GenAI development',
       source:                'community',
       extension_reviewed:    false,
diff --git a/pkg/rancher-desktop/utils/_demo_metadata.js b/pkg/rancher-desktop/utils/_demo_metadata.js
index 40daad1ccfa..3b405388c48 100644
--- a/pkg/rancher-desktop/utils/_demo_metadata.js
+++ b/pkg/rancher-desktop/utils/_demo_metadata.js
@@ -12,14 +12,14 @@ export default {
         {
           OS:      'linux',
           Arch:    'amd64',
-          Size:    24043507,
-          Created: '2024-11-28T19:17:26.91232165Z',
+          Size:    24099772,
+          Created: '2024-12-20T23:13:59.937900634Z',
         },
         {
           OS:      'linux',
           Arch:    'arm64',
-          Size:    24433856,
-          Created: '2024-11-28T19:22:42.255849506Z',
+          Size:    23803440,
+          Created: '2024-12-20T23:19:14.909876985Z',
         },
       ],
       Labels: {

From a0cbbcd7d6b781b651b8f431a2d114f11ecbe6d1 Mon Sep 17 00:00:00 2001
From: Gunasekhar Matamalam <gunasekhar.matamalam@suse.com>
Date: Fri, 20 Dec 2024 15:37:19 -0800
Subject: [PATCH 30/60] Updated the digest for v0.0.2 bump

Signed-off-by: Gunasekhar Matamalam <gunasekhar.matamalam@suse.com>
---
 pkg/rancher-desktop/utils/_demo_metadata.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/rancher-desktop/utils/_demo_metadata.js b/pkg/rancher-desktop/utils/_demo_metadata.js
index 3b405388c48..46dfd12ae55 100644
--- a/pkg/rancher-desktop/utils/_demo_metadata.js
+++ b/pkg/rancher-desktop/utils/_demo_metadata.js
@@ -6,8 +6,8 @@ export default {
       'llm',
     ],
     LatestVersion: {
-      Tag:                'v0.0.1',
-      ManifestListDigest: 'sha256:b51023520230fb21f5b10773bdd2dc936d320754d353c932b4f342c3b32c9394',
+      Tag:                'v0.0.2',
+      ManifestListDigest: 'sha256:4cb0b9f19152fccfacf4a74e133d7e783762de46323c0f054e20ab5d12e54a24',
       Platforms:          [
         {
           OS:      'linux',

From 3aca91c78c4afd742035c35f9631d0e23cc1286b Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Sat, 21 Dec 2024 08:37:02 +0000
Subject: [PATCH 31/60] Bump spinCLI from 3.1.0 to 3.1.1

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 c3cb8de80de..65fad403650 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -23,5 +23,5 @@ moproxy: 0.5.1
 spinShim: 0.17.0
 spinOperator: 0.4.0
 certManager: 1.16.2
-spinCLI: 3.1.0
+spinCLI: 3.1.1
 spinKubePlugin: 0.3.1

From 9667a82eba57ec6e6666a1bf3c63f375a2508b72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 09:54:18 +0000
Subject: [PATCH 32/60] build(deps): bump github/codeql-action from 3.27.9 to
 3.28.0

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.9 to 3.28.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/df409f7d9260372bd5f19e5b04e83cb3c43714ae...48ab28a6f5dbc2a99bf1e0131198dd8f1df78169)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql.yaml   | 4 ++--
 .github/workflows/scorecard.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index b160f3171f3..841ffefb375 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -51,7 +51,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
+      uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -79,6 +79,6 @@ jobs:
         exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
+      uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index ee8c587a7b7..cd2bad98c28 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -60,6 +60,6 @@ jobs:
     # Upload the results to GitHub's code scanning dashboard (optional).
     # Commenting out will disable upload of results to your repo's Code Scanning dashboard
     - name: "Upload to code-scanning"
-      uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
+      uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
       with:
         sarif_file: results.sarif

From 569cd1ae1bea2203c09ed1df3c91048687d8a8ba Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Mon, 23 Dec 2024 16:45:24 -0800
Subject: [PATCH 33/60] Add GHA to update k3s-versions.json

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
---
 .github/actions/spelling/expect.txt |   1 +
 .github/dependabot.yml              |  13 ++
 .github/workflows/k3s-versions.yaml |  37 ++++++
 go.work                             |   1 +
 scripts/go.mod                      |   5 +
 scripts/go.sum                      |   2 +
 scripts/k3s-versions.go             | 182 ++++++++++++++++++++++++++++
 scripts/k3s-versions.sh             |  49 ++++++++
 src/go/networking/go.mod            |   2 +-
 src/go/networking/go.sum            |   4 +-
 10 files changed, 293 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/k3s-versions.yaml
 create mode 100644 scripts/go.mod
 create mode 100644 scripts/go.sum
 create mode 100644 scripts/k3s-versions.go
 create mode 100755 scripts/k3s-versions.sh

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index f54d825bc1c..fde5181e559 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -288,6 +288,7 @@ gcs
 GENERALIZEDTIME
 getfattr
 getwindowid
+gha
 ghp
 gitmodules
 gitrepo
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index bad9b495784..83595b7556c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -200,3 +200,16 @@ updates:
       patterns: ["golang.org/x/*"]
     k8s:
       patterns: ["k8s.io/*"]
+
+- package-ecosystem: "gomod"
+  directory: "/scripts"
+  schedule:
+    interval: "daily"
+  open-pull-requests-limit: 12
+  labels: ["component/dependencies"]
+  reviewers: ["jandubois"]
+  groups:
+    golang-x:
+      patterns: ["golang.org/x/*"]
+    k8s:
+      patterns: ["k8s.io/*"]
diff --git a/.github/workflows/k3s-versions.yaml b/.github/workflows/k3s-versions.yaml
new file mode 100644
index 00000000000..a16a628fb71
--- /dev/null
+++ b/.github/workflows/k3s-versions.yaml
@@ -0,0 +1,37 @@
+name: Update k3s-versions.json
+on:
+  schedule:
+  - cron: '43 8 * * *'
+  workflow_dispatch: {}
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  check-for-token:
+    outputs:
+      has-token: ${{ steps.calc.outputs.HAS_SECRET }}
+    runs-on: ubuntu-latest
+    steps:
+    - id: calc
+      run: echo "HAS_SECRET=${HAS_SECRET}" >> "${GITHUB_OUTPUT}"
+      env:
+        HAS_SECRET: ${{ secrets.RUN_WORKFLOW_FROM_WORKFLOW != '' }}
+
+  check-update-versions:
+    needs: check-for-token
+    if: needs.check-for-token.outputs.has-token == 'true'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      with:
+        # we may need to checkout an existing branch, so need the full history
+        fetch-depth: 0
+    # Setup go to be able to run `go run ./scripts/k3s-version.go`
+    - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
+      with:
+        go-version-file: go.work
+    - run: ./scripts/k3s-versions.sh
+      env:
+        GITHUB_TOKEN: ${{ secrets.RUN_WORKFLOW_FROM_WORKFLOW }}
diff --git a/go.work b/go.work
index 99584ceb3c3..3f9e7606ceb 100644
--- a/go.work
+++ b/go.work
@@ -3,6 +3,7 @@ go 1.23.0
 toolchain go1.23.4
 
 use (
+	./scripts
 	./src/go/docker-credential-none
 	./src/go/extension-proxy
 	./src/go/github-runner-monitor
diff --git a/scripts/go.mod b/scripts/go.mod
new file mode 100644
index 00000000000..a785970ed83
--- /dev/null
+++ b/scripts/go.mod
@@ -0,0 +1,5 @@
+module github.com/rancher-sandbox/rancher-desktop/scripts
+
+go 1.23
+
+require golang.org/x/mod v0.22.0
diff --git a/scripts/go.sum b/scripts/go.sum
new file mode 100644
index 00000000000..36066b89e4f
--- /dev/null
+++ b/scripts/go.sum
@@ -0,0 +1,2 @@
+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
diff --git a/scripts/k3s-versions.go b/scripts/k3s-versions.go
new file mode 100644
index 00000000000..bff078d9e0f
--- /dev/null
+++ b/scripts/k3s-versions.go
@@ -0,0 +1,182 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"maps"
+	"net/http"
+	"os"
+	"slices"
+	"strconv"
+	"strings"
+
+	"golang.org/x/mod/semver"
+)
+
+// golang.org/x/mod/semver *requires* a leading 'v' on versions, and will add missing minor/patch numbers.
+const minimumVersion = "v1.21"
+
+type Channels struct {
+	Data []Channel `json:"data"`
+}
+type Channel struct {
+	Name   string `json:"name"`
+	Latest string `json:"latest"`
+}
+
+// getK3sChannels returns a map of all non-prerelease channels, plus "latest" and "stable".
+// The values are the latest release for each channel.
+func getK3sChannels() (map[string]string, error) {
+	resp, err := http.Get("https://update.k3s.io/v1-release/channels")
+	if err != nil {
+		return nil, fmt.Errorf("failed to get k3s channels: %w", err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("update channel request failed with status: %s", resp.Status)
+	}
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read response body for k3s update channel: %w", err)
+	}
+
+	var channels Channels
+	if err := json.Unmarshal(body, &channels); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal response from k3s update channel: %w", err)
+	}
+
+	k3sChannels := make(map[string]string)
+	for _, channel := range channels.Data {
+		switch {
+		case channel.Name == "latest" || channel.Name == "stable":
+			break
+		case semver.Prerelease(channel.Latest) != "":
+			continue
+		case semver.IsValid(channel.Latest) && semver.Compare(channel.Latest, minimumVersion) >= 0:
+			break
+		default:
+			continue
+		}
+		// Turn "v1.31.3+k3s1" into "1.31.3"
+		latest := strings.TrimPrefix(channel.Latest, "v")
+		latest = strings.SplitN(latest, "+", 2)[0]
+		k3sChannels[channel.Name] = latest
+	}
+
+	return k3sChannels, nil
+}
+
+type GithubRelease struct {
+	TagName    string `json:"tag_name"`
+	Draft      bool   `json:"draft"`
+	Prerelease bool   `json:"prerelease"`
+}
+
+// getGithubReleasesPage fetches a single page of GitHub releases and returns a list
+// of all non-draft, non-prerelease releases higher than the minimumVersion.
+func getGithubReleasesPage(page int) ([]GithubRelease, error) {
+	url := fmt.Sprintf("https://api.github.com/repos/k3s-io/k3s/releases?page=%d", page)
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request for %q: %w", url, err)
+	}
+	token := os.Getenv("GH_TOKEN")
+	if token == "" {
+		token = os.Getenv("GITHUB_TOKEN")
+	}
+	if token != "" {
+		req.Header.Set("Authorization", "token "+token)
+	}
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to make request for %q: %w", url, err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		//nolint:revive // error-strings
+		return nil, fmt.Errorf("GitHub API request failed with status: %s", resp.Status)
+	}
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read response body for %q: %w", url, err)
+	}
+
+	var releases []GithubRelease
+	if err := json.Unmarshal(body, &releases); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal response for %q: %w", url, err)
+	}
+
+	// Filter desired releases here, so caller will stop requesting additional pages if there are
+	// no more matches (heuristics, but releases are returned in reverse chronological order).
+	releases = slices.DeleteFunc(releases, func(release GithubRelease) bool {
+		return release.Draft || release.Prerelease || semver.Compare(release.TagName, minimumVersion) < 0
+	})
+	return releases, nil
+}
+
+// getGithubReleases returns a sorted list of all matching GitHub releases.
+func getGithubReleases() ([]string, error) {
+	releaseMap := make(map[string]string)
+	for page := 1; ; page++ {
+		releases, err := getGithubReleasesPage(page)
+		if err != nil {
+			return nil, err
+		}
+		if len(releases) == 0 {
+			break
+		}
+		for _, release := range releases {
+			version := semver.Canonical(release.TagName)
+			// for each version we only keep the latest k3s patch, i.e. +k3s2 instead of +k3s1
+			if oldTag, ok := releaseMap[version]; ok {
+				oldPatch, _ := strconv.Atoi(strings.TrimPrefix(semver.Build(oldTag), "+k3s"))
+				patch, _ := strconv.Atoi(strings.TrimPrefix(semver.Build(release.TagName), "+k3s"))
+				if oldPatch > patch {
+					continue
+				}
+			}
+			releaseMap[version] = release.TagName
+		}
+	}
+
+	return slices.SortedFunc(maps.Values(releaseMap), semver.Compare), nil
+}
+
+func getK3sVersions() (string, error) {
+	k3sChannels, err := getK3sChannels()
+	if err != nil {
+		return "", fmt.Errorf("error fetching k3s channels: %w", err)
+	}
+
+	githubReleases, err := getGithubReleases()
+	if err != nil {
+		return "", fmt.Errorf("error fetching GitHub releases: %w", err)
+	}
+
+	result := map[string]interface{}{
+		"cacheVersion": 2,
+		"channels":     k3sChannels,
+		"versions":     githubReleases,
+	}
+
+	// json.Marshal will produce map keys in sort order
+	jsonResult, err := json.MarshalIndent(result, "", "  ")
+	if err != nil {
+		return "", fmt.Errorf("error marshalling result to JSON: %w", err)
+	}
+	return string(jsonResult), nil
+}
+
+func main() {
+	versions, err := getK3sVersions()
+	if err != nil {
+		panic(err)
+	}
+
+	fmt.Println(versions)
+}
diff --git a/scripts/k3s-versions.sh b/scripts/k3s-versions.sh
new file mode 100755
index 00000000000..fb6f4394dff
--- /dev/null
+++ b/scripts/k3s-versions.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# This script expects to be called from the root of the repo.
+# It will rebuild resources/k3s-versions.json from both the k3s update
+# channel and the GitHub k3s releases list.
+# Creates a pull request if the new version is different.
+
+set -eu
+
+K3S_VERSIONS="resources/k3s-versions.json"
+BRANCH_NAME="gha-update-k3s-versions"
+NEW_PR="true"
+
+if git rev-parse --verify "origin/${BRANCH_NAME}" 2>/dev/null; then
+    # This logic relies on the fact that PR branches inside the repo get automatically
+    # deleted when the PR has been merged. We assume that if the branch exists, there
+    # is also a corresponding PR for it, so we just update the branch with a new commit.
+    git checkout "$BRANCH_NAME"
+    NEW_PR="false"
+else
+    git checkout -b "$BRANCH_NAME"
+fi
+
+go run ./scripts/k3s-versions.go "$MINIMUM_VERSION" >"$K3S_VERSIONS"
+
+# Exit if there are no changes
+if git diff --exit-code; then
+    exit
+fi
+
+export GIT_CONFIG_COUNT=2
+export GIT_CONFIG_KEY_0=user.name
+export GIT_CONFIG_VALUE_0="Rancher Desktop GitHub Action"
+export GIT_CONFIG_KEY_1=user.email
+export GIT_CONFIG_VALUE_1="donotuse@rancherdesktop.io"
+
+git add "$K3S_VERSIONS"
+git commit --signoff --message "Automated update: k3s-versions.json"
+git push origin "$BRANCH_NAME"
+
+if [ "$NEW_PR" = "false" ]; then
+    exit
+fi
+
+gh pr create \
+    --title "Update k3s-versions.json" \
+    --body "This pull request contains the latest update to k3s-versions.json." \
+    --head "$BRANCH_NAME" \
+    --base main
diff --git a/src/go/networking/go.mod b/src/go/networking/go.mod
index 6d8f52356d1..7f62c0972a5 100644
--- a/src/go/networking/go.mod
+++ b/src/go/networking/go.mod
@@ -44,7 +44,7 @@ require (
 	github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
 	golang.org/x/crypto v0.30.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
-	golang.org/x/mod v0.21.0 // indirect
+	golang.org/x/mod v0.22.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
 	golang.org/x/tools v0.26.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
diff --git a/src/go/networking/go.sum b/src/go/networking/go.sum
index c1199b1cf4a..5ee126672ff 100644
--- a/src/go/networking/go.sum
+++ b/src/go/networking/go.sum
@@ -91,8 +91,8 @@ golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
-golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=

From b5fea01a6ec0aabc71b50499368df9bd0d2e3e7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Dec 2024 01:14:43 +0000
Subject: [PATCH 34/60] build(deps): bump google.golang.org/protobuf in
 /src/go/guestagent

Bumps google.golang.org/protobuf from 1.36.0 to 1.36.1.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/go/guestagent/go.mod | 2 +-
 src/go/guestagent/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/go/guestagent/go.mod b/src/go/guestagent/go.mod
index 42b1cfd9481..a454e84e75d 100644
--- a/src/go/guestagent/go.mod
+++ b/src/go/guestagent/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/sync v0.10.0
 	golang.org/x/sys v0.28.0
-	google.golang.org/protobuf v1.36.0
+	google.golang.org/protobuf v1.36.1
 	k8s.io/api v0.32.0
 	k8s.io/apimachinery v0.32.0
 	k8s.io/client-go v0.32.0
diff --git a/src/go/guestagent/go.sum b/src/go/guestagent/go.sum
index 3251be1f3a1..823d683a875 100644
--- a/src/go/guestagent/go.sum
+++ b/src/go/guestagent/go.sum
@@ -354,8 +354,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
-google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
+google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

From ba4c49f51983da3496d37f2a764a808842a48713 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Dec 2024 09:32:17 +0000
Subject: [PATCH 35/60] build(deps): bump actions/setup-go from 5.1.0 to 5.2.0

Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.1.0 to 5.2.0.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](https://github.com/actions/setup-go/compare/v5.1.0...3041bf56c941b39c61721a86cd11f3bb1338122a)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/k3s-versions.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/k3s-versions.yaml b/.github/workflows/k3s-versions.yaml
index a16a628fb71..e767bdbcfb7 100644
--- a/.github/workflows/k3s-versions.yaml
+++ b/.github/workflows/k3s-versions.yaml
@@ -29,7 +29,7 @@ jobs:
         # we may need to checkout an existing branch, so need the full history
         fetch-depth: 0
     # Setup go to be able to run `go run ./scripts/k3s-version.go`
-    - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
+    - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
       with:
         go-version-file: go.work
     - run: ./scripts/k3s-versions.sh

From 1c6878a22d208c6d4bd3f4474dcec830f9676973 Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Tue, 24 Dec 2024 09:57:33 -0800
Subject: [PATCH 36/60] Remove unused MINIMUM_VERSION variable from
 k3s-versions.sh

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
---
 scripts/k3s-versions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/k3s-versions.sh b/scripts/k3s-versions.sh
index fb6f4394dff..3f88c9998d2 100755
--- a/scripts/k3s-versions.sh
+++ b/scripts/k3s-versions.sh
@@ -21,7 +21,7 @@ else
     git checkout -b "$BRANCH_NAME"
 fi
 
-go run ./scripts/k3s-versions.go "$MINIMUM_VERSION" >"$K3S_VERSIONS"
+go run ./scripts/k3s-versions.go >"$K3S_VERSIONS"
 
 # Exit if there are no changes
 if git diff --exit-code; then

From 64331963e7b077503a73ac89ca4597ec9b945672 Mon Sep 17 00:00:00 2001
From: Rancher Desktop GitHub Action <donotuse@rancherdesktop.io>
Date: Tue, 24 Dec 2024 18:32:14 +0000
Subject: [PATCH 37/60] Automated update: k3s-versions.json

Signed-off-by: Rancher Desktop GitHub Action <donotuse@rancherdesktop.io>
---
 resources/k3s-versions.json | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/resources/k3s-versions.json b/resources/k3s-versions.json
index 89361cb43b3..39d03c2076b 100644
--- a/resources/k3s-versions.json
+++ b/resources/k3s-versions.json
@@ -1,19 +1,19 @@
 {
   "cacheVersion": 2,
   "channels": {
-    "latest": "v1.31.3+k3s1",
-    "stable": "v1.31.3+k3s1",
-    "v1.21": "v1.21.14+k3s1",
-    "v1.22": "v1.22.17+k3s1",
-    "v1.23": "v1.23.17+k3s1",
-    "v1.24": "v1.24.17+k3s1",
-    "v1.25": "v1.25.16+k3s4",
-    "v1.26": "v1.26.15+k3s1",
-    "v1.27": "v1.27.16+k3s1",
-    "v1.28": "v1.28.15+k3s1",
-    "v1.29": "v1.29.11+k3s1",
-    "v1.30": "v1.30.7+k3s1",
-    "v1.31": "v1.31.3+k3s1"
+    "latest": "1.31.4",
+    "stable": "1.31.4",
+    "v1.21": "1.21.14",
+    "v1.22": "1.22.17",
+    "v1.23": "1.23.17",
+    "v1.24": "1.24.17",
+    "v1.25": "1.25.16",
+    "v1.26": "1.26.15",
+    "v1.27": "1.27.16",
+    "v1.28": "1.28.15",
+    "v1.29": "1.29.12",
+    "v1.30": "1.30.8",
+    "v1.31": "1.31.4"
   },
   "versions": [
     "v1.21.0+k3s1",
@@ -153,6 +153,7 @@
     "v1.29.9+k3s1",
     "v1.29.10+k3s1",
     "v1.29.11+k3s1",
+    "v1.29.12+k3s1",
     "v1.30.0+k3s1",
     "v1.30.1+k3s1",
     "v1.30.2+k3s2",
@@ -161,9 +162,11 @@
     "v1.30.5+k3s1",
     "v1.30.6+k3s1",
     "v1.30.7+k3s1",
+    "v1.30.8+k3s1",
     "v1.31.0+k3s1",
     "v1.31.1+k3s1",
     "v1.31.2+k3s1",
-    "v1.31.3+k3s1"
+    "v1.31.3+k3s1",
+    "v1.31.4+k3s1"
   ]
 }

From 239029c35e377766d51fe781228cc06d62940965 Mon Sep 17 00:00:00 2001
From: Mark Yen <mark.yen@suse.com>
Date: Tue, 24 Dec 2024 12:22:20 -0800
Subject: [PATCH 38/60] WSL: Enable debug logging for wsl-init

If debug mode is set, we enable debug logging for wsl-init (and therefore
network-setup).

Signed-off-by: Mark Yen <mark.yen@suse.com>
---
 pkg/rancher-desktop/assets/scripts/wsl-init |  2 +-
 pkg/rancher-desktop/backend/wsl.ts          | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkg/rancher-desktop/assets/scripts/wsl-init b/pkg/rancher-desktop/assets/scripts/wsl-init
index 2bbdbd629d3..a6049b15b85 100644
--- a/pkg/rancher-desktop/assets/scripts/wsl-init
+++ b/pkg/rancher-desktop/assets/scripts/wsl-init
@@ -21,7 +21,7 @@ if [ $$ -ne "1" ]; then
     # from WSL.
     exec /usr/local/bin/network-setup --logfile "$NETWORK_SETUP_LOG" \
     --vm-switch-path /usr/local/bin/vm-switch --vm-switch-logfile \
-    "$VM_SWITCH_LOG" --unshare-arg "${0}"
+    "$VM_SWITCH_LOG" ${RD_DEBUG:+-debug} --unshare-arg "${0}"
 fi
 
 # Mark directories that we will need to bind mount as shared mounts.
diff --git a/pkg/rancher-desktop/backend/wsl.ts b/pkg/rancher-desktop/backend/wsl.ts
index 6706a577ed4..aae9164a9fd 100644
--- a/pkg/rancher-desktop/backend/wsl.ts
+++ b/pkg/rancher-desktop/backend/wsl.ts
@@ -1041,15 +1041,20 @@ export default class WSLBackend extends events.EventEmitter implements VMBackend
 
     // The process should already be gone by this point, but make sure.
     this.process?.kill('SIGTERM');
+    const env: Record<string, string> = {
+      ...process.env,
+      WSLENV:           `${ process.env.WSLENV }:DISTRO_DATA_DIRS:LOG_DIR/p:RD_DEBUG`,
+      DISTRO_DATA_DIRS: DISTRO_DATA_DIRS.join(':'),
+      LOG_DIR:          paths.logs,
+    };
+
+    if (this.debug) {
+      env.RD_DEBUG = '1';
+    }
     this.process = childProcess.spawn('wsl.exe',
       ['--distribution', INSTANCE_NAME, '--exec', '/usr/local/bin/wsl-init'],
       {
-        env: {
-          ...process.env,
-          WSLENV:           `${ process.env.WSLENV }:DISTRO_DATA_DIRS:LOG_DIR/p`,
-          DISTRO_DATA_DIRS: DISTRO_DATA_DIRS.join(':'),
-          LOG_DIR:          paths.logs,
-        },
+        env,
         stdio:       ['ignore', 'pipe', 'pipe'],
         windowsHide: true,
       });

From 35ec4c4a0359e1a22483409c7af05a3845920aa4 Mon Sep 17 00:00:00 2001
From: Mark Yen <mark.yen@suse.com>
Date: Tue, 24 Dec 2024 12:29:21 -0800
Subject: [PATCH 39/60] WSL: network-setup try to lock OS thread

We're doing some namespace jiggling; sometimes it seems like we can end up
in the wrong namespace (where we fail to configure the veth pair for
veth-rd-ns), and it's in a situation where veth-rd-wsl is visible.
Assuming this is because we've jumped OS threads due to golang green thread
scheduling issues, try to lock the OS thread to mitigate the issue.

Signed-off-by: Mark Yen <mark.yen@suse.com>
---
 src/go/networking/cmd/network/setup_linux.go | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/go/networking/cmd/network/setup_linux.go b/src/go/networking/cmd/network/setup_linux.go
index 5a7c636bb0d..e5eb08c7072 100644
--- a/src/go/networking/cmd/network/setup_linux.go
+++ b/src/go/networking/cmd/network/setup_linux.go
@@ -23,6 +23,7 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"runtime"
 	"strconv"
 
 	"github.com/linuxkit/virtsock/pkg/vsock"
@@ -88,6 +89,11 @@ func main() {
 	}
 	logrus.Debugf("successful connection to host on CID: %v and Port: %d: connection: %+v", vsock.CIDHost, vsockDialPort, vsockConn)
 
+	// Ensure we stay on the same OS thread so that we don't switch namespaces
+	// accidentally.
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
 	originNS, err := netns.Get()
 	if err != nil {
 		logrus.Errorf("failed getting a handle to the current namespace: %v", err)
@@ -151,7 +157,7 @@ func main() {
 		logrus.Errorf("failed to close original NS, ignoring error: %v", err)
 	}
 
-	logrus.Trace("Network setup complete, waiting for vm-switch")
+	logrus.Debug("Network setup complete, waiting for vm-switch")
 
 	if err := vmSwitchCmd.Wait(); err != nil {
 		logrus.Errorf("vm-switch exited with error: %v", err)
@@ -250,7 +256,7 @@ func cleanupVethLink(originNS netns.NsHandle) {
 func configureVethPair(vethName, ipAddr string) error {
 	veth, err := netlink.LinkByName(vethName)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to get link %s: %w", vethName, err)
 	}
 
 	vethIP := net.IPNet{
@@ -260,11 +266,11 @@ func configureVethPair(vethName, ipAddr string) error {
 
 	addr := &netlink.Addr{IPNet: &vethIP, Label: ""}
 	if err := netlink.AddrAdd(veth, addr); err != nil {
-		return err
+		return fmt.Errorf("failed to add addr %s to %s: %w", addr, vethName, err)
 	}
 
 	if err := netlink.LinkSetUp(veth); err != nil {
-		return err
+		return fmt.Errorf("failed to set up link %s: %w", vethName, err)
 	}
 	return nil
 }

From dee0fa1b38dd9092942cf5f54c391343c53d00b5 Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Wed, 25 Dec 2024 09:26:13 +0000
Subject: [PATCH 40/60] Bump trivy from 0.58.0 to 0.58.1

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 65fad403650..2cb746a6c73 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -11,7 +11,7 @@ dockerCLI: 27.4.1
 dockerBuildx: 0.19.3
 dockerCompose: 2.32.1
 golangci-lint: 1.62.2
-trivy: 0.58.0
+trivy: 0.58.1
 steve: 0.1.0-beta9
 rancherDashboard: desktop-v2.7.0.beta.1
 dockerProvidedCredentialHelpers: 0.8.2

From 18d4237502727e44e5a73ef204c80f6148614ae9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Dec 2024 10:00:37 +0000
Subject: [PATCH 41/60] build(deps): bump github.com/lima-vm/lima in
 /src/go/guestagent

Bumps [github.com/lima-vm/lima](https://github.com/lima-vm/lima) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/lima-vm/lima/releases)
- [Commits](https://github.com/lima-vm/lima/compare/v1.0.2...v1.0.3)

---
updated-dependencies:
- dependency-name: github.com/lima-vm/lima
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/go/guestagent/go.mod | 12 ++++++------
 src/go/guestagent/go.sum | 34 ++++++++++++++++++----------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/go/guestagent/go.mod b/src/go/guestagent/go.mod
index a454e84e75d..d4599425124 100644
--- a/src/go/guestagent/go.mod
+++ b/src/go/guestagent/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/containers/gvisor-tap-vsock v0.8.1
 	github.com/docker/docker v27.4.1+incompatible
 	github.com/docker/go-connections v0.5.0
-	github.com/lima-vm/lima v1.0.2
+	github.com/lima-vm/lima v1.0.3
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/sync v0.10.0
 	golang.org/x/sys v0.28.0
@@ -85,17 +85,17 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
-	go.opentelemetry.io/otel/metric v1.28.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/otel v1.31.0 // indirect
+	go.opentelemetry.io/otel/metric v1.31.0 // indirect
+	go.opentelemetry.io/otel/trace v1.31.0 // indirect
 	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/term v0.27.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
 	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/grpc v1.67.1 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
+	google.golang.org/grpc v1.69.2 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/src/go/guestagent/go.sum b/src/go/guestagent/go.sum
index 823d683a875..947dcecc862 100644
--- a/src/go/guestagent/go.sum
+++ b/src/go/guestagent/go.sum
@@ -140,8 +140,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lima-vm/lima v1.0.2 h1:D6Lz/kqsQFie4iN9KWA+qz3FiZ2DcpQsuxv5quqMydk=
-github.com/lima-vm/lima v1.0.2/go.mod h1:2KZY3NJSIB1uECbQoUvIvNr8wwimcwGaKSGrSG2Xz/w=
+github.com/lima-vm/lima v1.0.3 h1:UMp5b/k0RGuNIPCjRAIBghcigNBB+AJNJCVjwx373aY=
+github.com/lima-vm/lima v1.0.3/go.mod h1:D1LqTMVsmNfnMmiaqjm0xacfG3QN+ceHz4vYtR1R5XQ=
 github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY=
 github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
@@ -229,18 +229,20 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg=
-go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
-go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
+go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY=
+go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
-go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
-go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
-go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE=
-go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg=
-go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
-go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
+go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE=
+go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY=
+go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk=
+go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0=
+go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc=
+go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8=
+go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys=
+go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A=
 go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
 go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -334,17 +336,17 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y=
 google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s=
-google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8=
-google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
+google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U=
+google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
-google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
+google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
+google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

From 5cf86fdc254d0bec533d1b6dc8ed8f618ba85f27 Mon Sep 17 00:00:00 2001
From: alihamzanoor <alihamzanoor99@gmail.com>
Date: Tue, 31 Dec 2024 02:14:19 +0000
Subject: [PATCH 42/60] Using the correct node version for local dev

Signed-off-by: alihamzanoor <alihamzanoor99@gmail.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1dc41f172c2..d649d11c786 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ you'll need to `source` that file.
 Currently we build Rancher Desktop with Node 20. To install it, run:
 
 ```
-nvm install 20.17
+nvm install 20.16
 ```
 
 Next, you'll need to install the yarn package manager:

From 4ff3b1743bb67f682b9fde0134b4c283d7082543 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 Dec 2024 09:15:23 +0000
Subject: [PATCH 43/60] build(deps): bump yaml from 2.6.1 to 2.7.0

Bumps [yaml](https://github.com/eemeli/yaml) from 2.6.1 to 2.7.0.
- [Release notes](https://github.com/eemeli/yaml/releases)
- [Commits](https://github.com/eemeli/yaml/compare/v2.6.1...v2.7.0)

---
updated-dependencies:
- dependency-name: yaml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0a61b56543f..a8316041b86 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "vue-slider-component": "3.2.24",
     "vuex": "3.6.2",
     "which": "5.0.0",
-    "yaml": "2.6.1"
+    "yaml": "2.7.0"
   },
   "devDependencies": {
     "@babel/eslint-parser": "7.25.9",
diff --git a/yarn.lock b/yarn.lock
index 38508c5d426..11b977ec8c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14116,10 +14116,10 @@ yallist@^5.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533"
   integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==
 
-yaml@2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773"
-  integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==
+yaml@2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.7.0.tgz#aef9bb617a64c937a9a748803786ad8d3ffe1e98"
+  integrity sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==
 
 yaml@^1.10.0, yaml@^1.10.2:
   version "1.10.2"

From 2dcca7243e41e7cbe835316d5fd0a7170bb16e08 Mon Sep 17 00:00:00 2001
From: Gunasekhar Matamalam <gunasekhar.matamalam@suse.com>
Date: Thu, 2 Jan 2025 16:13:33 -0800
Subject: [PATCH 44/60] Bumped the OI extension to the current latest v0.0.3
 and added previous versions

Signed-off-by: Gunasekhar Matamalam <gunasekhar.matamalam@suse.com>
---
 .../utils/_demo_marketplace_items.js          |   2 +-
 pkg/rancher-desktop/utils/_demo_metadata.js   | 108 ++++++++++++++++--
 2 files changed, 102 insertions(+), 8 deletions(-)

diff --git a/pkg/rancher-desktop/utils/_demo_marketplace_items.js b/pkg/rancher-desktop/utils/_demo_marketplace_items.js
index aec2edf6221..1625fc1d8c2 100644
--- a/pkg/rancher-desktop/utils/_demo_marketplace_items.js
+++ b/pkg/rancher-desktop/utils/_demo_marketplace_items.js
@@ -8,7 +8,7 @@ export const demoMarketplace = {
       type:                  'extension',
       publisher:             { name: 'SUSE LLC' },
       created_at:            '2024-10-03T15:43:34Z',
-      updated_at:            '2024-12-20T23:13:59.937900634Z',
+      updated_at:            '2025-01-02T23:40:10.563547097Z',
       short_description:     'Open WebUI and Ollama packaged into an extension for local GenAI development',
       source:                'community',
       extension_reviewed:    false,
diff --git a/pkg/rancher-desktop/utils/_demo_metadata.js b/pkg/rancher-desktop/utils/_demo_metadata.js
index 46dfd12ae55..fe8b0f80df2 100644
--- a/pkg/rancher-desktop/utils/_demo_metadata.js
+++ b/pkg/rancher-desktop/utils/_demo_metadata.js
@@ -6,20 +6,20 @@ export default {
       'llm',
     ],
     LatestVersion: {
-      Tag:                'v0.0.2',
-      ManifestListDigest: 'sha256:4cb0b9f19152fccfacf4a74e133d7e783762de46323c0f054e20ab5d12e54a24',
+      Tag:                'v0.0.3',
+      ManifestListDigest: 'sha256:c559256330fe8f09eb017e6fe03e557afb87e4fddafe533dc5866494eeb780fe',
       Platforms:          [
         {
           OS:      'linux',
           Arch:    'amd64',
-          Size:    24099772,
-          Created: '2024-12-20T23:13:59.937900634Z',
+          Size:    24099782,
+          Created: '2025-01-02T23:40:10.563547097Z',
         },
         {
           OS:      'linux',
           Arch:    'arm64',
-          Size:    23803440,
-          Created: '2024-12-20T23:19:14.909876985Z',
+          Size:    23803450,
+          Created: '2025-01-02T23:45:33.999040885Z',
         },
       ],
       Labels: {
@@ -36,7 +36,101 @@ export default {
         'org.opencontainers.image.vendor':           'SUSE LLC',
       },
     },
-    PreviousVersions: [],
+    PreviousVersions: [
+      {
+        Tag:                'v0.0.2',
+        ManifestListDigest: 'sha256:4cb0b9f19152fccfacf4a74e133d7e783762de46323c0f054e20ab5d12e54a24',
+        Platforms:          [
+          {
+            OS:      'linux',
+            Arch:    'amd64',
+            Size:    24099772,
+            Created: '2024-12-20T23:13:59.937900634Z',
+          },
+          {
+            OS:      'linux',
+            Arch:    'arm64',
+            Size:    23803440,
+            Created: '2024-12-20T23:19:14.909876985Z',
+          },
+        ],
+        Labels: {
+          'com.docker.desktop.extension.api.version':  '0.3.4',
+          'com.docker.desktop.extension.icon':         '',
+          'com.docker.extension.additional-urls':      '',
+          'com.docker.extension.categories':           '',
+          'com.docker.extension.changelog':            '',
+          'com.docker.extension.detailed-description': '',
+          'com.docker.extension.publisher-url':        '',
+          'com.docker.extension.screenshots':          '',
+          'org.opencontainers.image.description':      'Open WebUI on Rancher Desktop',
+          'org.opencontainers.image.title':            'Open WebUI',
+          'org.opencontainers.image.vendor':           'SUSE LLC',
+        },
+      },
+      {
+        Tag:                'v0.0.1',
+        ManifestListDigest: 'sha256:b51023520230fb21f5b10773bdd2dc936d320754d353c932b4f342c3b32c9394',
+        Platforms:          [
+          {
+            OS:      'linux',
+            Arch:    'amd64',
+            Size:    24043507,
+            Created: '2024-11-28T19:17:26.91232165Z',
+          },
+          {
+            OS:      'linux',
+            Arch:    'arm64',
+            Size:    24433856,
+            Created: '2024-11-28T19:22:42.255849506Z',
+          },
+        ],
+        Labels: {
+          'com.docker.desktop.extension.api.version':  '0.3.4',
+          'com.docker.desktop.extension.icon':         '',
+          'com.docker.extension.additional-urls':      '',
+          'com.docker.extension.categories':           '',
+          'com.docker.extension.changelog':            '',
+          'com.docker.extension.detailed-description': '',
+          'com.docker.extension.publisher-url':        '',
+          'com.docker.extension.screenshots':          '',
+          'org.opencontainers.image.description':      'Open WebUI on Rancher Desktop',
+          'org.opencontainers.image.title':            'Open WebUI',
+          'org.opencontainers.image.vendor':           'SUSE LLC',
+        },
+      },
+      {
+        Tag:                'v0.0.1-hackweek-preview',
+        ManifestListDigest: 'sha256:7fafe29e975bbad30a233f27cb8252da6e4ebc89158f82b80ac556bfd12fb1f0',
+        Platforms:          [
+          {
+            OS:      'linux',
+            Arch:    'amd64',
+            Size:    23991283,
+            Created: '2024-10-31T21:57:40.06488917Z',
+          },
+          {
+            OS:      'linux',
+            Arch:    'arm64',
+            Size:    24382144,
+            Created: '2024-10-31T22:02:55.339097457Z',
+          },
+        ],
+        Labels: {
+          'com.docker.desktop.extension.api.version':  '0.3.4',
+          'com.docker.desktop.extension.icon':         '',
+          'com.docker.extension.additional-urls':      '',
+          'com.docker.extension.categories':           '',
+          'com.docker.extension.changelog':            '',
+          'com.docker.extension.detailed-description': '',
+          'com.docker.extension.publisher-url':        '',
+          'com.docker.extension.screenshots':          '',
+          'org.opencontainers.image.description':      'Open WebUI on Rancher Desktop',
+          'org.opencontainers.image.title':            'Open WebUI',
+          'org.opencontainers.image.vendor':           'SUSE LLC',
+        },
+      },
+    ],
   },
   'ghcr.io/rancher-sandbox/epinio-desktop-extension': {
     CreatedTime:   '2022-05-06T00:44:00Z',

From 133f3f4085b5fc3ae417e06365bed9e52daff001 Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Fri, 3 Jan 2025 09:20:28 +0000
Subject: [PATCH 45/60] Bump golangci-lint from 1.62.2 to 1.63.3

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 2cb746a6c73..529ece83b38 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -10,7 +10,7 @@ helm: 3.16.4
 dockerCLI: 27.4.1
 dockerBuildx: 0.19.3
 dockerCompose: 2.32.1
-golangci-lint: 1.62.2
+golangci-lint: 1.63.3
 trivy: 0.58.1
 steve: 0.1.0-beta9
 rancherDashboard: desktop-v2.7.0.beta.1

From 08acf55fa713d0a36c021e4e02f59d40d117ade3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Jan 2025 09:37:07 +0000
Subject: [PATCH 46/60] build(deps): bump intl-messageformat from 10.7.10 to
 10.7.11

Bumps [intl-messageformat](https://github.com/formatjs/formatjs) from 10.7.10 to 10.7.11.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/intl-messageformat@10.7.10...intl-messageformat@10.7.11)

---
updated-dependencies:
- dependency-name: intl-messageformat
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 64 ++++++++++++++++++++++++++--------------------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index a8316041b86..d50b51c2fde 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "express": "4.21.2",
     "fs-extra": "11.2.0",
     "http-proxy-middleware": "3.0.3",
-    "intl-messageformat": "10.7.10",
+    "intl-messageformat": "10.7.11",
     "jquery": "3.7.1",
     "jsonpath": "1.1.1",
     "linux-ca": "2.0.1",
diff --git a/yarn.lock b/yarn.lock
index 11b977ec8c4..1a5511fb08f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1445,44 +1445,44 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
   integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
 
-"@formatjs/ecma402-abstract@2.3.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.1.tgz#cdeb3ffe1aeea9c4284b85b7e37e8e8615314c39"
-  integrity sha512-Ip9uV+/MpLXWRk03U/GzeJMuPeOXpJBSB5V1tjA6kJhvqssye5J5LoYLc7Z5IAHb7nR62sRoguzrFiVCP/hnzw==
+"@formatjs/ecma402-abstract@2.3.2":
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.2.tgz#0ee291effe7ee2c340742a6c95d92eacb5e6c00a"
+  integrity sha512-6sE5nyvDloULiyOMbOTJEEgWL32w+VHkZQs8S02Lnn8Y/O5aQhjOEXwWzvR7SsBE/exxlSpY2EsWZgqHbtLatg==
   dependencies:
-    "@formatjs/fast-memoize" "2.2.5"
-    "@formatjs/intl-localematcher" "0.5.9"
+    "@formatjs/fast-memoize" "2.2.6"
+    "@formatjs/intl-localematcher" "0.5.10"
     decimal.js "10"
     tslib "2"
 
-"@formatjs/fast-memoize@2.2.5":
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.5.tgz#54a4a1793d773b72c372d3dcab3595149aee7880"
-  integrity sha512-6PoewUMrrcqxSoBXAOJDiW1m+AmkrAj0RiXnOMD59GRaswjXhm3MDhgepXPBgonc09oSirAJTsAggzAGQf6A6g==
+"@formatjs/fast-memoize@2.2.6":
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.6.tgz#fac0a84207a1396be1f1aa4ee2805b179e9343d1"
+  integrity sha512-luIXeE2LJbQnnzotY1f2U2m7xuQNj2DA8Vq4ce1BY9ebRZaoPB1+8eZ6nXpLzsxuW5spQxr7LdCg+CApZwkqkw==
   dependencies:
     tslib "2"
 
-"@formatjs/icu-messageformat-parser@2.9.7":
-  version "2.9.7"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.7.tgz#84abd5c86ef2ad7cb82da63b3380c33808efb6da"
-  integrity sha512-cuEHyRM5VqLQobANOjtjlgU7+qmk9Q3fDQuBiRRJ3+Wp3ZoZhpUPtUfuimZXsir6SaI2TaAJ+SLo9vLnV5QcbA==
+"@formatjs/icu-messageformat-parser@2.9.8":
+  version "2.9.8"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.8.tgz#118e7156f8a8db6b27b650f09334db21456c681f"
+  integrity sha512-hZlLNI3+Lev8IAXuwehLoN7QTKqbx3XXwFW1jh0AdIA9XJdzn9Uzr+2LLBspPm/PX0+NLIfykj/8IKxQqHUcUQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.3.1"
-    "@formatjs/icu-skeleton-parser" "1.8.11"
+    "@formatjs/ecma402-abstract" "2.3.2"
+    "@formatjs/icu-skeleton-parser" "1.8.12"
     tslib "2"
 
-"@formatjs/icu-skeleton-parser@1.8.11":
-  version "1.8.11"
-  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.11.tgz#e7c9918274dfa0c1c2bca1ab6e15ef49b10cf0bb"
-  integrity sha512-8LlHHE/yL/zVJZHAX3pbKaCjZKmBIO6aJY1mkVh4RMSEu/2WRZ4Ysvv3kKXJ9M8RJLBHdnk1/dUQFdod1Dt7Dw==
+"@formatjs/icu-skeleton-parser@1.8.12":
+  version "1.8.12"
+  resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.12.tgz#43076747cdbe0f23bfac2b2a956bd8219716680d"
+  integrity sha512-QRAY2jC1BomFQHYDMcZtClqHR55EEnB96V7Xbk/UiBodsuFc5kujybzt87+qj1KqmJozFhk6n4KiT1HKwAkcfg==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.3.1"
+    "@formatjs/ecma402-abstract" "2.3.2"
     tslib "2"
 
-"@formatjs/intl-localematcher@0.5.9":
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.5.9.tgz#43c6ee22be85b83340bcb09bdfed53657a2720db"
-  integrity sha512-8zkGu/sv5euxbjfZ/xmklqLyDGQSxsLqg8XOq88JW3cmJtzhCP8EtSJXlaKZnVO4beEaoiT9wj4eIoCQ9smwxA==
+"@formatjs/intl-localematcher@0.5.10":
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.5.10.tgz#1e0bd3fc1332c1fe4540cfa28f07e9227b659a58"
+  integrity sha512-af3qATX+m4Rnd9+wHcjJ4w2ijq+rAVP3CCinJQvFv1kgSu1W6jypUmvleJxcewdxmutM8dmIRZFxO/IQBZmP2Q==
   dependencies:
     tslib "2"
 
@@ -8095,14 +8095,14 @@ internal-slot@^1.0.7:
     hasown "^2.0.0"
     side-channel "^1.0.4"
 
-intl-messageformat@10.7.10:
-  version "10.7.10"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.7.10.tgz#fc8fc8c13b0a4104ba08dc2f5f9225f14945bcb7"
-  integrity sha512-hp7iejCBiJdW3zmOe18FdlJu8U/JsADSDiBPQhfdSeI8B9POtvPRvPh3nMlvhYayGMKLv6maldhR7y3Pf1vkpw==
+intl-messageformat@10.7.11:
+  version "10.7.11"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.7.11.tgz#f24893b2a64e7b5ec29f9eceb4f1a58bde1346e0"
+  integrity sha512-IB2N1tmI24k2EFH3PWjU7ivJsnWyLwOWOva0jnXFa29WzB6fb0JZ5EMQGu+XN5lDtjHYFo0/UooP67zBwUg7rQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.3.1"
-    "@formatjs/fast-memoize" "2.2.5"
-    "@formatjs/icu-messageformat-parser" "2.9.7"
+    "@formatjs/ecma402-abstract" "2.3.2"
+    "@formatjs/fast-memoize" "2.2.6"
+    "@formatjs/icu-messageformat-parser" "2.9.8"
     tslib "2"
 
 ip-address@^9.0.5:

From c40ef1f1e948381210166e14e1609226dd4ac277 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Jan 2025 09:37:46 +0000
Subject: [PATCH 47/60] build(deps): bump marked from 15.0.4 to 15.0.5

Bumps [marked](https://github.com/markedjs/marked) from 15.0.4 to 15.0.5.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v15.0.4...v15.0.5)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a8316041b86..fa141e09778 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "jsonpath": "1.1.1",
     "linux-ca": "2.0.1",
     "lodash": "4.17.21",
-    "marked": "15.0.4",
+    "marked": "15.0.5",
     "native-reg": "1.1.1",
     "node-fetch": "2.7.0",
     "node-forge": "1.3.1",
diff --git a/yarn.lock b/yarn.lock
index 11b977ec8c4..5efc0d699fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9973,10 +9973,10 @@ map-stream@~0.1.0:
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
   integrity sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==
 
-marked@15.0.4:
-  version "15.0.4"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-15.0.4.tgz#864dbf50227b6507646c771c2ef5f0de2924833e"
-  integrity sha512-TCHvDqmb3ZJ4PWG7VEGVgtefA5/euFmsIhxtD0XsBxI39gUSKL81mIRFdt0AiNQozUahd4ke98ZdirExd/vSEw==
+marked@15.0.5:
+  version "15.0.5"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-15.0.5.tgz#1b5c58a2fb56afe57379f8cc721ab60e0450a5b5"
+  integrity sha512-xN+kSuqHjxWg+Q47yhhZMUP+kO1qHobvXkkm6FX+7N6lDvanLDd8H7AQ0jWDDyq+fDt/cSrJaBGyWYHXy0KQWA==
 
 matcher@^3.0.0:
   version "3.0.0"

From a066924df36cca4ea9a5159a732431cda7d1edc6 Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Fri, 3 Jan 2025 17:47:21 -0800
Subject: [PATCH 48/60] Make sure chrome-sandbox has setuid bit

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
---
 .github/workflows/smoke-test/smoke-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/smoke-test/smoke-test.sh b/.github/workflows/smoke-test/smoke-test.sh
index 5c63883cd03..adc87793ea8 100755
--- a/.github/workflows/smoke-test/smoke-test.sh
+++ b/.github/workflows/smoke-test/smoke-test.sh
@@ -117,6 +117,7 @@ install_linux() {
 
     sudo mkdir -p /opt/rancher-desktop
     sudo unzip -d /opt/rancher-desktop "$archiveName"
+    sudo chmod 4755 /opt/rancher-desktop/chrome-sandbox
 
     RDCTL="/opt/rancher-desktop/resources/resources/linux/bin/rdctl"
 }

From ab9c6e3cb8b164aff1a6f7831e92a8ba5406a61d Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Sat, 4 Jan 2025 08:38:18 +0000
Subject: [PATCH 49/60] Bump golangci-lint from 1.63.3 to 1.63.4

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 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 529ece83b38..876706243ea 100644
--- a/pkg/rancher-desktop/assets/dependencies.yaml
+++ b/pkg/rancher-desktop/assets/dependencies.yaml
@@ -10,7 +10,7 @@ helm: 3.16.4
 dockerCLI: 27.4.1
 dockerBuildx: 0.19.3
 dockerCompose: 2.32.1
-golangci-lint: 1.63.3
+golangci-lint: 1.63.4
 trivy: 0.58.1
 steve: 0.1.0-beta9
 rancherDashboard: desktop-v2.7.0.beta.1

From 894698d233b80f92530039f603fb4b1a26b71f25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 10:08:53 +0000
Subject: [PATCH 50/60] build(deps-dev): bump @types/lodash from 4.17.13 to
 4.17.14

Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash)

---
updated-dependencies:
- dependency-name: "@types/lodash"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2a8dd818f1f..ba85fa38dd9 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
     "@types/dompurify": "3.2.0",
     "@types/ejs": "3.1.5",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.13",
+    "@types/lodash": "4.17.14",
     "@types/mustache": "4.2.5",
     "@types/node": "20.16.5",
     "@types/node-fetch": "2.6.9",
diff --git a/yarn.lock b/yarn.lock
index d746132adce..568ad141d39 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3039,10 +3039,10 @@
   resolved "https://registry.yarnpkg.com/@types/less/-/less-3.0.6.tgz#279b51245ba787c810a0d286226c5900cd5e6765"
   integrity sha512-PecSzorDGdabF57OBeQO/xFbAkYWo88g4Xvnsx7LRwqLC17I7OoKtA3bQB9uXkY6UkMWCOsA8HSVpaoitscdXw==
 
-"@types/lodash@4.17.13":
-  version "4.17.13"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.13.tgz#786e2d67cfd95e32862143abe7463a7f90c300eb"
-  integrity sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==
+"@types/lodash@4.17.14":
+  version "4.17.14"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.14.tgz#bafc053533f4cdc5fcc9635af46a963c1f3deaff"
+  integrity sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==
 
 "@types/mime@^1":
   version "1.3.2"

From 3b6748044f0f6e18fb8cd4fc2474b7fc052c7308 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 10:09:11 +0000
Subject: [PATCH 51/60] build(deps-dev): bump sass from 1.83.0 to 1.83.1

Bumps [sass](https://github.com/sass/dart-sass) from 1.83.0 to 1.83.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.83.0...1.83.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2a8dd818f1f..b6d6fd5a0a9 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,7 @@
     "octokit": "3.2.1",
     "ps-tree": "1.2.0",
     "raw-loader": "4.0.2",
-    "sass": "1.83.0",
+    "sass": "1.83.1",
     "sass-loader": "16.0.4",
     "ts-jest": "29.2.5",
     "ts-loader": "^9.5.1",
diff --git a/yarn.lock b/yarn.lock
index d746132adce..86572356927 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11973,10 +11973,10 @@ sass-resources-loader@^2.2.5:
     glob "^7.1.6"
     loader-utils "^2.0.0"
 
-sass@1.83.0:
-  version "1.83.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.0.tgz#e36842c0b88a94ed336fd16249b878a0541d536f"
-  integrity sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==
+sass@1.83.1:
+  version "1.83.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.1.tgz#dee1ab94b47a6f9993d3195d36f556bcbda64846"
+  integrity sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==
   dependencies:
     chokidar "^4.0.0"
     immutable "^5.0.2"

From b73469438b44360811a34c3687f1165e3bdca2db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 10:55:51 +0000
Subject: [PATCH 52/60] build(deps): bump golang.org/x/sys

Bumps the golang-x group in /src/go/networking with 1 update: [golang.org/x/sys](https://github.com/golang/sys).


Updates `golang.org/x/sys` from 0.28.0 to 0.29.0
- [Commits](https://github.com/golang/sys/compare/v0.28.0...v0.29.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/go/networking/go.mod | 2 +-
 src/go/networking/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/go/networking/go.mod b/src/go/networking/go.mod
index 73d84ec4e56..b66ab48153e 100644
--- a/src/go/networking/go.mod
+++ b/src/go/networking/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/vishvananda/netns v0.0.5
 	golang.org/x/net v0.33.0
 	golang.org/x/sync v0.10.0
-	golang.org/x/sys v0.28.0
+	golang.org/x/sys v0.29.0
 	gvisor.dev/gvisor v0.0.0-20240916094835-a174eb65023f
 )
 
diff --git a/src/go/networking/go.sum b/src/go/networking/go.sum
index e183cf171e4..ebf1405b20e 100644
--- a/src/go/networking/go.sum
+++ b/src/go/networking/go.sum
@@ -106,8 +106,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

From 4d0bd6b176075100e12af341cd203a2a36be278b Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Mon, 6 Jan 2025 11:53:34 +0000
Subject: [PATCH 53/60] Update go modules

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 src/go/docker-credential-none/go.mod | 2 +-
 src/go/docker-credential-none/go.sum | 4 ++--
 src/go/github-runner-monitor/go.mod  | 2 +-
 src/go/github-runner-monitor/go.sum  | 4 ++--
 src/go/guestagent/go.mod             | 2 +-
 src/go/guestagent/go.sum             | 4 ++--
 src/go/mock-wsl/go.mod               | 2 +-
 src/go/mock-wsl/go.sum               | 4 ++--
 src/go/nerdctl-stub/generate/go.mod  | 2 +-
 src/go/nerdctl-stub/generate/go.sum  | 4 ++--
 src/go/nerdctl-stub/go.mod           | 2 +-
 src/go/nerdctl-stub/go.sum           | 4 ++--
 src/go/rdctl/go.mod                  | 2 +-
 src/go/rdctl/go.sum                  | 4 ++--
 src/go/wsl-helper/go.mod             | 2 +-
 src/go/wsl-helper/go.sum             | 4 ++--
 16 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/go/docker-credential-none/go.mod b/src/go/docker-credential-none/go.mod
index 76116925052..431850a695a 100644
--- a/src/go/docker-credential-none/go.mod
+++ b/src/go/docker-credential-none/go.mod
@@ -14,6 +14,6 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af // indirect
 	github.com/stretchr/testify v1.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
 	gotest.tools/v3 v3.5.1 // indirect
 )
diff --git a/src/go/docker-credential-none/go.sum b/src/go/docker-credential-none/go.sum
index 64647629bba..26287276d77 100644
--- a/src/go/docker-credential-none/go.sum
+++ b/src/go/docker-credential-none/go.sum
@@ -20,8 +20,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/src/go/github-runner-monitor/go.mod b/src/go/github-runner-monitor/go.mod
index 7f0437a13a3..e580ae8cb6e 100644
--- a/src/go/github-runner-monitor/go.mod
+++ b/src/go/github-runner-monitor/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
-	golang.org/x/sys v0.28.0
+	golang.org/x/sys v0.29.0
 )
 
 require (
diff --git a/src/go/github-runner-monitor/go.sum b/src/go/github-runner-monitor/go.sum
index 4617ac9e76e..b3b70d8bc50 100644
--- a/src/go/github-runner-monitor/go.sum
+++ b/src/go/github-runner-monitor/go.sum
@@ -68,8 +68,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/src/go/guestagent/go.mod b/src/go/guestagent/go.mod
index d4599425124..899ec2c6811 100644
--- a/src/go/guestagent/go.mod
+++ b/src/go/guestagent/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/lima-vm/lima v1.0.3
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/sync v0.10.0
-	golang.org/x/sys v0.28.0
+	golang.org/x/sys v0.29.0
 	google.golang.org/protobuf v1.36.1
 	k8s.io/api v0.32.0
 	k8s.io/apimachinery v0.32.0
diff --git a/src/go/guestagent/go.sum b/src/go/guestagent/go.sum
index 947dcecc862..079e01b99bd 100644
--- a/src/go/guestagent/go.sum
+++ b/src/go/guestagent/go.sum
@@ -303,8 +303,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
diff --git a/src/go/mock-wsl/go.mod b/src/go/mock-wsl/go.mod
index 8019312a448..5ade422a4e1 100644
--- a/src/go/mock-wsl/go.mod
+++ b/src/go/mock-wsl/go.mod
@@ -4,6 +4,6 @@ go 1.22.0
 
 require (
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
-	golang.org/x/sys v0.28.0
+	golang.org/x/sys v0.29.0
 	golang.org/x/text v0.21.0
 )
diff --git a/src/go/mock-wsl/go.sum b/src/go/mock-wsl/go.sum
index dc43867fdbf..aa0e3d47948 100644
--- a/src/go/mock-wsl/go.sum
+++ b/src/go/mock-wsl/go.sum
@@ -1,6 +1,6 @@
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
diff --git a/src/go/nerdctl-stub/generate/go.mod b/src/go/nerdctl-stub/generate/go.mod
index 5909eb8876f..e7fc4fe8604 100644
--- a/src/go/nerdctl-stub/generate/go.mod
+++ b/src/go/nerdctl-stub/generate/go.mod
@@ -8,5 +8,5 @@ require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/stretchr/testify v1.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
 )
diff --git a/src/go/nerdctl-stub/generate/go.sum b/src/go/nerdctl-stub/generate/go.sum
index d1fc97788c0..c2f601eead3 100644
--- a/src/go/nerdctl-stub/generate/go.sum
+++ b/src/go/nerdctl-stub/generate/go.sum
@@ -12,8 +12,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/src/go/nerdctl-stub/go.mod b/src/go/nerdctl-stub/go.mod
index 2b2c633e596..934fb0e8342 100644
--- a/src/go/nerdctl-stub/go.mod
+++ b/src/go/nerdctl-stub/go.mod
@@ -5,7 +5,7 @@ go 1.22.0
 require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/sys v0.28.0
+	golang.org/x/sys v0.29.0
 )
 
 require (
diff --git a/src/go/nerdctl-stub/go.sum b/src/go/nerdctl-stub/go.sum
index cae01ba63ad..5cef371d214 100644
--- a/src/go/nerdctl-stub/go.sum
+++ b/src/go/nerdctl-stub/go.sum
@@ -21,8 +21,8 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
diff --git a/src/go/rdctl/go.mod b/src/go/rdctl/go.mod
index 074b18fa4c4..fd87c1e1187 100644
--- a/src/go/rdctl/go.mod
+++ b/src/go/rdctl/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/sys v0.28.0
+	golang.org/x/sys v0.29.0
 	golang.org/x/text v0.21.0
 )
 
diff --git a/src/go/rdctl/go.sum b/src/go/rdctl/go.sum
index dc35e1e4060..26e048795bb 100644
--- a/src/go/rdctl/go.sum
+++ b/src/go/rdctl/go.sum
@@ -49,8 +49,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/src/go/wsl-helper/go.mod b/src/go/wsl-helper/go.mod
index c634fd74cc1..bfe8a27d14f 100644
--- a/src/go/wsl-helper/go.mod
+++ b/src/go/wsl-helper/go.mod
@@ -21,7 +21,7 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/sys v0.28.0
+	golang.org/x/sys v0.29.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/client-go v0.32.0
 )
diff --git a/src/go/wsl-helper/go.sum b/src/go/wsl-helper/go.sum
index 2e10a02724d..958f9947f6f 100644
--- a/src/go/wsl-helper/go.sum
+++ b/src/go/wsl-helper/go.sum
@@ -102,8 +102,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

From 0d4609f24bb9b644c7153471b7c688ea9e300611 Mon Sep 17 00:00:00 2001
From: Mark Yen <mark.yen@suse.com>
Date: Mon, 6 Jan 2025 11:44:36 -0800
Subject: [PATCH 54/60] RPM: Don't use %post to set SUID on chrome-sandbox

Use RPM-internal specification to set the SUID bit, so that `rpm --verify`
won't flag it as having been modified.

Signed-off-by: Mark Yen <mark.yen@suse.com>
---
 packaging/linux/rancher-desktop.spec | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packaging/linux/rancher-desktop.spec b/packaging/linux/rancher-desktop.spec
index 79b747f3bfe..17347b18fd0 100644
--- a/packaging/linux/rancher-desktop.spec
+++ b/packaging/linux/rancher-desktop.spec
@@ -130,29 +130,27 @@ mv resources/resources/linux/rancher-desktop.desktop share/applications/rancher-
 mv resources/resources/linux/rancher-desktop.appdata.xml share/metainfo/rancher-desktop.appdata.xml
 
 # Remove qemu binaries included in lima tarball
-rm -v resources/resources/linux/lima/bin/qemu-* 
+rm -v resources/resources/linux/lima/bin/qemu-*
 rm -rvf resources/resources/linux/lima/lib
 rm -rvf resources/resources/linux/lima/share/qemu
 
 %install
 mkdir -p "%{buildroot}%{_prefix}/bin" "%{buildroot}/opt/%{name}"
 
-cp -ra ./share "%{buildroot}%{_prefix}" 
+cp -ra ./share "%{buildroot}%{_prefix}"
 cp -ra ./* "%{buildroot}/opt/%{name}"
 
 # Link to the binary
 ln -sf "/opt/%{name}/rancher-desktop" "%{buildroot}%{_bindir}/rancher-desktop"
 
 %post
-# SUID chrome-sandbox for Electron 5+
-chmod 4755 "/opt/%{name}/chrome-sandbox"
-
 update-desktop-database %{_prefix}/share/applications || true
 
 %files
 %defattr(-,root,root,-)
 %dir /opt/%{name}
 /opt/%{name}*
+%attr(4755,root,root) /opt/%{name}/chrome-sandbox
 %{_bindir}/rancher-desktop
 %{_prefix}/share/applications/rancher-desktop.desktop
 %{_prefix}/share/icons/hicolor/*

From 479c06eb9d9fad6751a2f0c2631ab9e95cad4951 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 09:22:27 +0000
Subject: [PATCH 55/60] build(deps): bump marked from 15.0.5 to 15.0.6

Bumps [marked](https://github.com/markedjs/marked) from 15.0.5 to 15.0.6.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v15.0.5...v15.0.6)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e0ad7a2743b..d9bc1779d14 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "jsonpath": "1.1.1",
     "linux-ca": "2.0.1",
     "lodash": "4.17.21",
-    "marked": "15.0.5",
+    "marked": "15.0.6",
     "native-reg": "1.1.1",
     "node-fetch": "2.7.0",
     "node-forge": "1.3.1",
diff --git a/yarn.lock b/yarn.lock
index daf40431793..943f426e0d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9973,10 +9973,10 @@ map-stream@~0.1.0:
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
   integrity sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==
 
-marked@15.0.5:
-  version "15.0.5"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-15.0.5.tgz#1b5c58a2fb56afe57379f8cc721ab60e0450a5b5"
-  integrity sha512-xN+kSuqHjxWg+Q47yhhZMUP+kO1qHobvXkkm6FX+7N6lDvanLDd8H7AQ0jWDDyq+fDt/cSrJaBGyWYHXy0KQWA==
+marked@15.0.6:
+  version "15.0.6"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-15.0.6.tgz#8165f16afb6f4b30a35bdcee657c3b8415820a8f"
+  integrity sha512-Y07CUOE+HQXbVDCGl3LXggqJDbXDP2pArc2C1N1RRMN0ONiShoSsIInMd5Gsxupe7fKLpgimTV+HOJ9r7bA+pg==
 
 matcher@^3.0.0:
   version "3.0.0"

From 231452dbbe140a466f7e866cc53082efafc58d89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 09:22:42 +0000
Subject: [PATCH 56/60] build(deps-dev): bump @electron/asar from 3.2.17 to
 3.2.18

Bumps [@electron/asar](https://github.com/electron/asar) from 3.2.17 to 3.2.18.
- [Release notes](https://github.com/electron/asar/releases)
- [Changelog](https://github.com/electron/asar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/electron/asar/compare/v3.2.17...v3.2.18)

---
updated-dependencies:
- dependency-name: "@electron/asar"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e0ad7a2743b..6efe0b87c2f 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/plugin-proposal-private-methods": "7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
-    "@electron/asar": "3.2.17",
+    "@electron/asar": "3.2.18",
     "@electron/fuses": "^1.8.0",
     "@electron/notarize": "2.5.0",
     "@nuxt/types": "2.18.1",
diff --git a/yarn.lock b/yarn.lock
index daf40431793..a584b2fe18b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1326,10 +1326,10 @@
   resolved "https://registry.yarnpkg.com/@docker/extension-api-client-types/-/extension-api-client-types-0.3.4.tgz#0393c98ecad937f95ea805615a917060358aa384"
   integrity sha512-cDdD+dNSE0XCvQiw0R4j9aHpK+p6E7vi+z7RbKXfxwuQpfEMoeNCKFlp4W7K3XT78iWmoPz3DxQtZEAe4VJ1oQ==
 
-"@electron/asar@3.2.17", "@electron/asar@^3.2.7":
-  version "3.2.17"
-  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.17.tgz#91d28087aad80d1a1c8cc4e667c6476edf50f949"
-  integrity sha512-OcWImUI686w8LkghQj9R2ynZ2ME693Ek6L1SiaAgqGKzBaTIZw3fHDqN82Rcl+EU1Gm9EgkJ5KLIY/q5DCRbbA==
+"@electron/asar@3.2.18", "@electron/asar@^3.2.7":
+  version "3.2.18"
+  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.18.tgz#fa607f829209bab8b9e0ce6658d3fe81b2cba517"
+  integrity sha512-2XyvMe3N3Nrs8cV39IKELRHTYUWFKrmqqSY1U+GMlc0jvqjIVnoxhNd2H4JolWQncbJi1DCvb5TNxZuI2fEjWg==
   dependencies:
     commander "^5.0.0"
     glob "^7.1.6"

From 1fa55ce1ef2d1007db39ff4b97a9d09ed740abae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 09:53:21 +0000
Subject: [PATCH 57/60] build(deps): bump
 github.com/containernetworking/plugins

Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/containernetworking/plugins/releases)
- [Commits](https://github.com/containernetworking/plugins/compare/v1.6.1...v1.6.2)

---
updated-dependencies:
- dependency-name: github.com/containernetworking/plugins
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/go/guestagent/go.mod | 2 +-
 src/go/guestagent/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/go/guestagent/go.mod b/src/go/guestagent/go.mod
index 899ec2c6811..aa5d2730076 100644
--- a/src/go/guestagent/go.mod
+++ b/src/go/guestagent/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/Masterminds/log-go v1.0.0
 	github.com/containerd/containerd v1.7.24
 	github.com/containerd/containerd/api v1.8.0
-	github.com/containernetworking/plugins v1.6.1
+	github.com/containernetworking/plugins v1.6.2
 	github.com/containers/gvisor-tap-vsock v0.8.1
 	github.com/docker/docker v27.4.1+incompatible
 	github.com/docker/go-connections v0.5.0
diff --git a/src/go/guestagent/go.sum b/src/go/guestagent/go.sum
index 079e01b99bd..d8a4dc27bed 100644
--- a/src/go/guestagent/go.sum
+++ b/src/go/guestagent/go.sum
@@ -42,8 +42,8 @@ github.com/containerd/typeurl/v2 v2.2.0 h1:6NBDbQzr7I5LHgp34xAXYF5DOTQDn05X58lsP
 github.com/containerd/typeurl/v2 v2.2.0/go.mod h1:8XOOxnyatxSWuG8OfsZXVnAF4iZfedjS/8UHSPJnX4g=
 github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8FuJbEslXM=
 github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
-github.com/containernetworking/plugins v1.6.1 h1:bYd2bpE6hEBqexyaiI2/sst0xJ+v7pEMWrjA5qtkxiU=
-github.com/containernetworking/plugins v1.6.1/go.mod h1:SP5UG3jDO9LtmfbBJdP+nl3A1atOtbj2MBOYsnaxy64=
+github.com/containernetworking/plugins v1.6.2 h1:pqP8Mq923TLyef5g97XfJ/xpDeVek4yF8A4mzy9Tc4U=
+github.com/containernetworking/plugins v1.6.2/go.mod h1:SP5UG3jDO9LtmfbBJdP+nl3A1atOtbj2MBOYsnaxy64=
 github.com/containers/gvisor-tap-vsock v0.8.1 h1:88qkOjGMF9NmyoVG/orUw73mdwj3z4aOwEbRS01hF78=
 github.com/containers/gvisor-tap-vsock v0.8.1/go.mod h1:gjdY4JBWnynrXsxT8+OM7peEOd4FCZpoOWjSadHva0g=
 github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc=

From 08104509973edc148ffecd1e10900278667d3b13 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 09:53:23 +0000
Subject: [PATCH 58/60] build(deps): bump google.golang.org/protobuf in
 /src/go/guestagent

Bumps google.golang.org/protobuf from 1.36.1 to 1.36.2.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/go/guestagent/go.mod | 2 +-
 src/go/guestagent/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/go/guestagent/go.mod b/src/go/guestagent/go.mod
index 899ec2c6811..5c0eb4121d1 100644
--- a/src/go/guestagent/go.mod
+++ b/src/go/guestagent/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/sync v0.10.0
 	golang.org/x/sys v0.29.0
-	google.golang.org/protobuf v1.36.1
+	google.golang.org/protobuf v1.36.2
 	k8s.io/api v0.32.0
 	k8s.io/apimachinery v0.32.0
 	k8s.io/client-go v0.32.0
diff --git a/src/go/guestagent/go.sum b/src/go/guestagent/go.sum
index 079e01b99bd..0f38a4607e4 100644
--- a/src/go/guestagent/go.sum
+++ b/src/go/guestagent/go.sum
@@ -356,8 +356,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
-google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
+google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

From 86adbf5e76c6984fb1cdcdbe6f9159b2f4cb8436 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 10:13:07 +0000
Subject: [PATCH 59/60] build(deps): bump golang.org/x/net

Bumps the golang-x group in /src/go/networking with 1 update: [golang.org/x/net](https://github.com/golang/net).


Updates `golang.org/x/net` from 0.33.0 to 0.34.0
- [Commits](https://github.com/golang/net/compare/v0.33.0...v0.34.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/go/networking/go.mod |  4 ++--
 src/go/networking/go.sum | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/go/networking/go.mod b/src/go/networking/go.mod
index b66ab48153e..eab35232751 100644
--- a/src/go/networking/go.mod
+++ b/src/go/networking/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/vishvananda/netlink v1.3.0
 	github.com/vishvananda/netns v0.0.5
-	golang.org/x/net v0.33.0
+	golang.org/x/net v0.34.0
 	golang.org/x/sync v0.10.0
 	golang.org/x/sys v0.29.0
 	gvisor.dev/gvisor v0.0.0-20240916094835-a174eb65023f
@@ -42,7 +42,7 @@ require (
 	github.com/qdm12/gosettings v0.4.1 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/mod v0.22.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
diff --git a/src/go/networking/go.sum b/src/go/networking/go.sum
index ebf1405b20e..c01d785a05c 100644
--- a/src/go/networking/go.sum
+++ b/src/go/networking/go.sum
@@ -85,8 +85,8 @@ github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zd
 github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
@@ -95,8 +95,8 @@ golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
 golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -108,8 +108,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
 golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=

From fb77c4f39e1d994f8815a4b89a2fa2bb95a440d8 Mon Sep 17 00:00:00 2001
From: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
Date: Tue, 7 Jan 2025 10:27:58 +0000
Subject: [PATCH 60/60] Update go modules

Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
---
 src/go/guestagent/go.mod | 4 ++--
 src/go/guestagent/go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/go/guestagent/go.mod b/src/go/guestagent/go.mod
index 899ec2c6811..3b2e05b3a10 100644
--- a/src/go/guestagent/go.mod
+++ b/src/go/guestagent/go.mod
@@ -88,9 +88,9 @@ require (
 	go.opentelemetry.io/otel v1.31.0 // indirect
 	go.opentelemetry.io/otel/metric v1.31.0 // indirect
 	go.opentelemetry.io/otel/trace v1.31.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/term v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.7.0 // indirect
 	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
diff --git a/src/go/guestagent/go.sum b/src/go/guestagent/go.sum
index 079e01b99bd..565f2da035a 100644
--- a/src/go/guestagent/go.sum
+++ b/src/go/guestagent/go.sum
@@ -272,8 +272,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
 golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
@@ -306,8 +306,8 @@ golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
 golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=