Merge pull request #9131 from jandubois/integration-1.20

Integration into release-1.20

Author: jandubois

bats/tests/helpers/commands.bash

@@ -55,7 +55,10 @@ docker_exe() {
         "$PATH_RESOURCES/$PLATFORM/bin/docker$EXE" "$@" | no_cr
 }
 helm() {
-    "$PATH_RESOURCES/$PLATFORM/bin/helm$EXE" "$@" | no_cr
+    # Add path to bundled credential helpers to the front of the PATH; also
+    # ensure that on Windows, it gets exported.
+    PATH="$PATH_RESOURCES/$PLATFORM/bin:$PATH" WSLENV="PATH/l:${WSLENV:-}" \
+        "$PATH_RESOURCES/$PLATFORM/bin/helm$EXE" "$@" | no_cr
 }
 kubectl() {
     kubectl_exe --context rancher-desktop "$@"

packaging/linux/rancher-desktop.spec

@@ -62,7 +62,7 @@ Requires: libdrm2
 Requires: libexpat1
 Requires: libgbm1
 Requires: libgcc1
-Requires: libgdk-pixbuf2.0-0
+Requires: libgdk-pixbuf-2.0-0
 Requires: libglib2.0-0
 Requires: libglib2.0-dev
 Requires: libgtk-3-0

pkg/rancher-desktop/assets/dependencies.yaml

@@ -6,7 +6,7 @@ alpineLimaISO:
   alpineVersion: 3.21.3
 WSLDistro: "0.85"
 kuberlr: 0.6.1
-helm: 3.18.5
+helm: 3.18.6
 dockerCLI: 28.3.3
 dockerBuildx: 0.26.1
 dockerCompose: 2.39.2

pkg/rancher-desktop/backend/containerClient/mobyClient.ts

@@ -502,7 +502,7 @@ export class MobyClient implements ContainerEngineClient {
       dirsToAdd.push(executableDir);
     }
 
-    const opts = _.merge({ env: process.env }, options ?? {}, {
+    const opts = _.merge({ env: _.merge({}, process.env) }, options ?? {}, {
       env: {
         DOCKER_HOST: this.endpoint,
         PATH:        `${ process.env.PATH }${ path.delimiter }${ dirsToAdd.join(path.delimiter) }`,

pkg/rancher-desktop/components/MountTypeSelector.vue

@@ -115,7 +115,7 @@ export default defineComponent({
       let tooltip = {};
 
       if (disabled) {
-        tooltip = { content: this.t(`prefs.onlyWithVZ_${ this.arch }`) };
+        tooltip = { content: this.t(`prefs.onlyWithVZ_${ this.arch }`, undefined, true) };
       }
 
       return tooltip;

pkg/rancher-desktop/components/Nav.vue

@@ -20,7 +20,7 @@
           <i
             v-if="item.experimental"
             v-tooltip="{
-              content: t('prefs.experimental'),
+              content: t('prefs.experimental', undefined, true),
               placement: 'right',
             }"
             :class="`icon icon-flask`"

pkg/rancher-desktop/components/Preferences/VirtualMachineEmulation.vue

@@ -73,7 +73,7 @@ export default defineComponent({
       let tooltip = {};
 
       if (disabled) {
-        tooltip = { content: this.t(`prefs.onlyFromVentura_${ this.arch }`) };
+        tooltip = { content: this.t(`prefs.onlyFromVentura_${ this.arch }`, undefined, true) };
       }
 
       return tooltip;

pkg/rancher-desktop/components/Preferences/WslProxy.vue

@@ -63,7 +63,7 @@ export default defineComponent({
         :label="t('virtualMachine.proxy.label', { }, true)"
         :value="preferences.experimental.virtualMachine.proxy.enabled"
         :is-locked="isPreferenceLocked('experimental.virtualMachine.proxy.enabled')"
-        @input="onChange('experimental.virtualMachine.proxy.enabled', $event)"
+        @update:value="onChange('experimental.virtualMachine.proxy.enabled', $event)"
       />
     </rd-fieldset>
     <hr>

pkg/rancher-desktop/components/RdInput.vue

@@ -36,7 +36,7 @@ export default defineComponent({
       <i
         v-if="isLocked"
         v-tooltip="{
-          content: tooltip || t('preferences.locked.tooltip'),
+          content: tooltip || t('preferences.locked.tooltip', undefined, true),
           placement: 'right',
         }"
         class="icon icon-lock"

pkg/rancher-desktop/components/RdSelect.vue

@@ -62,7 +62,7 @@ export default defineComponent({
       <i
         v-if="isLocked"
         v-tooltip="{
-          content: tooltip || t('preferences.locked.tooltip'),
+          content: tooltip || t('preferences.locked.tooltip', undefined, true),
           placement: 'right',
         }"
         class="icon icon-lock"