Remove networkingTunnel from settings

Signed-off-by: Nino Kodabande <[email protected]>
rancher-sandbox · Sep 6, 2024 · 0cfcb72 · 0cfcb72
1 parent a7d0923
commit 0cfcb72
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 31 deletions.
diff --git a/e2e/backend.e2e.spec.ts b/e2e/backend.e2e.spec.ts
@@ -155,8 +155,6 @@ test.describe.serial('KubernetesBackend', () => {
         expectedDefinition['application.adminAccess'] = false;
         expectedDefinition['virtualMachine.numberCPUs'] = false;
         expectedDefinition['virtualMachine.memoryInGB'] = false;
-      } else if (process.platform === 'win32') {
-        expectedDefinition['experimental.virtualMachine.networkingTunnel'] = false;
       }
 
       const expected: Record<string, {current: any, desired: any, severity: 'reset' | 'restart'}> = {};

diff --git a/pkg/rancher-desktop/backend/kube/wsl.ts b/pkg/rancher-desktop/backend/kube/wsl.ts
@@ -227,10 +227,10 @@ export default class WSLKubernetesBackend extends events.EventEmitter implements
           }
           await util.promisify(timers.setTimeout)(1_000);
         }
-        const rdNetworking = `--rd-networking=${ config?.experimental.virtualMachine.networkingTunnel }`;
 
+        // TODO: remove once --rd-networking removed from k3s_kubeconfig.go
         await this.k3sHelper.updateKubeconfig(
-          async() => await this.vm.execCommand({ capture: true }, await this.vm.getWSLHelperPath(), 'k3s', 'kubeconfig', rdNetworking));
+          async() => await this.vm.execCommand({ capture: true }, await this.vm.getWSLHelperPath(), 'k3s', 'kubeconfig', '--rd-networking=true'));
       });
 
     const client = this.client = kubeClient?.() || new KubeClient();

diff --git a/pkg/rancher-desktop/backend/wsl.ts b/pkg/rancher-desktop/backend/wsl.ts
@@ -1294,13 +1294,7 @@ export default class WSLBackend extends events.EventEmitter implements VMBackend
                 }),
                 this.progressTracker.action('Configuring image proxy', 50, async() => {
                   const allowedImagesConf = '/usr/local/openresty/nginx/conf/allowed-images.conf';
-                  let resolver;
-
-                  if (this.cfg?.experimental.virtualMachine.networkingTunnel) {
-                    resolver = `resolver ${ rdNetworkingDNS } ipv6=off;\n`;
-                  } else {
-                    resolver = `resolver ${ await this.ipAddress } ipv6=off;\n`;
-                  }
+                  const resolver = `resolver ${ rdNetworkingDNS } ipv6=off;\n`;
 
                   await this.writeFile(`/usr/local/openresty/nginx/conf/nginx.conf`, NGINX_CONF, 0o644);
                   await this.writeFile(`/usr/local/openresty/nginx/conf/resolver.conf`, resolver, 0o644);
@@ -1650,7 +1644,7 @@ export default class WSLBackend extends events.EventEmitter implements VMBackend
     }
 
     return Promise.resolve(this.kubeBackend.requiresRestartReasons(
-      this.cfg, cfg, { 'experimental.virtualMachine.networkingTunnel': { current: this.cfg.experimental.virtualMachine.networkingTunnel } }));
+      this.cfg, cfg));
   }
 
   /**

diff --git a/pkg/rancher-desktop/config/__tests__/settings.spec.ts b/pkg/rancher-desktop/config/__tests__/settings.spec.ts
@@ -354,7 +354,6 @@ describe('settings', () => {
               },
               experimental: {
                 virtualMachine: {
-                  networkingTunnel: true,
                 },
               },
               kubernetes: {
@@ -472,8 +471,7 @@ describe('settings', () => {
         version:      settings.CURRENT_SETTINGS_VERSION,
         experimental: {
           virtualMachine: {
-            networkingTunnel: true,
-            proxy:            {
+            proxy: {
               noproxy: ['1.2.3.4', '11.12.13.14', '21.22.23.24'],
             },
           },
@@ -506,8 +504,7 @@ describe('settings', () => {
         version:      settings.CURRENT_SETTINGS_VERSION,
         experimental: {
           virtualMachine: {
-            networkingTunnel: true,
-            proxy:            {
+            proxy: {
               noproxy: ['1.2.3.4', '11.12.13.14', '21.22.23.24'],
             },
           },
@@ -587,7 +584,6 @@ describe('settings', () => {
         },
         experimental: {
           virtualMachine: {
-            networkingTunnel: true,
           },
         },
         kubernetes:     {},

diff --git a/pkg/rancher-desktop/config/settings.ts b/pkg/rancher-desktop/config/settings.ts
@@ -132,9 +132,7 @@ export const defaultSettings = {
           cacheMode:       CacheMode.MMAP,
         },
       },
-      /* windows only: legacy setting, always ignored */
-      networkingTunnel: true,
-      proxy:            {
+      proxy: {
         enabled:  false,
         address:  '',
         password: '',

diff --git a/pkg/rancher-desktop/config/settingsImpl.ts b/pkg/rancher-desktop/config/settingsImpl.ts
@@ -487,6 +487,7 @@ export const updateTable: Record<number, (settings: any, locked : boolean) => vo
   },
   13: (settings) => {
     _.unset(settings, 'virtualMachine.hostResolver');
+    _.unset(settings, 'experimental.virtualMachine.networkingTunnel');
   },
 };
 

diff --git a/pkg/rancher-desktop/main/commandServer/__tests__/settingsValidator.spec.ts b/pkg/rancher-desktop/main/commandServer/__tests__/settingsValidator.spec.ts
@@ -78,7 +78,6 @@ describe(SettingsValidator, () => {
       ['experimental', 'virtualMachine', 'mount', '9p', 'protocolVersion'],
       ['experimental', 'virtualMachine', 'mount', '9p', 'securityModel'],
       ['experimental', 'virtualMachine', 'mount', 'type'],
-      ['experimental', 'virtualMachine', 'networkingTunnel'], // Cannot be set
       ['experimental', 'virtualMachine', 'type'],
       ['experimental', 'virtualMachine', 'useRosetta'],
       ['experimental', 'virtualMachine', 'proxy', 'noproxy'],

diff --git a/pkg/rancher-desktop/main/commandServer/settingsValidator.ts b/pkg/rancher-desktop/main/commandServer/settingsValidator.ts
@@ -122,15 +122,8 @@ export default class SettingsValidator {
               cacheMode:       this.checkLima(this.check9P(this.checkEnum(...Object.values(CacheMode)))),
             },
           },
-          // networkingTunnel only applies to Win32, but deployment profiles on macOS/Linux may still include
-          // the setting. Since we changed the default value, this would now throw a validation error.
-          // see https://github.com/rancher-sandbox/rancher-desktop/issues/6953
-          // The setting will be removed once the legacy Windows networking mode is disabled, so until
-          // then we will allow changing the setting on all platforms to avoid the profile error.
-          // Changing the setting will have no effect on macOS/Linux anyways.1
-          networkingTunnel: this.checkUnchanged,
-          useRosetta:       this.checkPlatform('darwin', this.checkRosetta),
-          type:             this.checkPlatform('darwin', this.checkMulti(
+          useRosetta: this.checkPlatform('darwin', this.checkRosetta),
+          type:       this.checkPlatform('darwin', this.checkMulti(
             this.checkEnum(...Object.values(VMType)),
             this.checkVMType),
           ),