From a00aa9d482ccdd572641c9206ef1f4133718f702 Mon Sep 17 00:00:00 2001 From: Nino Kodabande Date: Wed, 11 Sep 2024 09:40:28 -0700 Subject: [PATCH] Remove enableIptables flag Signed-off-by: Nino Kodabande --- pkg/rancher-desktop/backend/k3sHelper.ts | 23 ----------------------- pkg/rancher-desktop/backend/wsl.ts | 3 --- src/go/guestagent/go.mod | 2 +- src/go/guestagent/go.sum | 2 -- src/go/guestagent/main.go | 1 - 5 files changed, 1 insertion(+), 30 deletions(-) diff --git a/pkg/rancher-desktop/backend/k3sHelper.ts b/pkg/rancher-desktop/backend/k3sHelper.ts index 97ed70c378e..5c27ca495a4 100644 --- a/pkg/rancher-desktop/backend/k3sHelper.ts +++ b/pkg/rancher-desktop/backend/k3sHelper.ts @@ -1119,29 +1119,6 @@ export default class K3sHelper extends events.EventEmitter { } } - /** - * Check if the given Kubernetes version requires the port forwarding fix - * (where we listen on a local port). - * - * @param version Kubernetes version; null if no Kubernetes will run. - */ - static requiresPortForwardingFix(version: semver.SemVer | undefined): boolean { - if (!version) { - // When Kubernetes is disabled, don't try to do NodePort forwarding. - return false; - } - switch (true) { - case version.major !== 1: return true; - case version.minor < 21: return false; - case version.minor === 21: return version.patch >= 12; - case version.minor === 22: return version.patch >= 10; - case version.minor === 23: return version.patch >= 7; - case version.minor >= 24: return true; - default: - throw new Error(`Unexpected Kubernetes version ${ version }`); - } - } - /** * Helper for implementing KubernetesBackend.requiresRestartReasons */ diff --git a/pkg/rancher-desktop/backend/wsl.ts b/pkg/rancher-desktop/backend/wsl.ts index 531879cf87c..bd3ede5d095 100644 --- a/pkg/rancher-desktop/backend/wsl.ts +++ b/pkg/rancher-desktop/backend/wsl.ts @@ -17,7 +17,6 @@ import { } from './backend'; import BackendHelper from './backendHelper'; import { ContainerEngineClient, MobyClient, NerdctlClient } from './containerClient'; -import K3sHelper from './k3sHelper'; import ProgressTracker, { getProgressErrorDescription } from './progressTracker'; import DEPENDENCY_VERSIONS from '@pkg/assets/dependencies.yaml'; @@ -786,14 +785,12 @@ export default class WSLBackend extends events.EventEmitter implements VMBackend protected async installGuestAgent(kubeVersion: semver.SemVer | undefined, cfg: BackendSettings | undefined) { const enableKubernetes = !!kubeVersion; - const iptables = enableKubernetes && !K3sHelper.requiresPortForwardingFix(kubeVersion); const isAdminInstall = await this.getIsAdminInstall(); const guestAgentConfig: Record = { LOG_DIR: await this.wslify(paths.logs), GUESTAGENT_ADMIN_INSTALL: isAdminInstall ? 'true' : 'false', GUESTAGENT_KUBERNETES: enableKubernetes ? 'true' : 'false', - GUESTAGENT_IPTABLES: iptables.toString(), // only enable IPTABLES for older K8s GUESTAGENT_CONTAINERD: cfg?.containerEngine.name === ContainerEngine.CONTAINERD ? 'true' : 'false', GUESTAGENT_DOCKER: cfg?.containerEngine.name === ContainerEngine.MOBY ? 'true' : 'false', GUESTAGENT_DEBUG: this.debug ? 'true' : 'false', diff --git a/src/go/guestagent/go.mod b/src/go/guestagent/go.mod index cecc47cbe77..2d76891a83b 100644 --- a/src/go/guestagent/go.mod +++ b/src/go/guestagent/go.mod @@ -12,7 +12,6 @@ require ( github.com/docker/docker v24.0.1+incompatible github.com/docker/go-connections v0.4.0 github.com/gogo/protobuf v1.3.2 - github.com/lima-vm/lima v1.0.0-alpha.0 github.com/stretchr/testify v1.9.0 golang.org/x/sync v0.8.0 golang.org/x/sys v0.25.0 @@ -95,6 +94,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + gotest.tools/v3 v3.5.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect diff --git a/src/go/guestagent/go.sum b/src/go/guestagent/go.sum index 1480954f97f..54cb7ef71a5 100644 --- a/src/go/guestagent/go.sum +++ b/src/go/guestagent/go.sum @@ -134,8 +134,6 @@ 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.0-alpha.0 h1:ytvyw0N3X7TLKH//D2rbM3IEnjYVcm0yH2cxlSIjE6M= -github.com/lima-vm/lima v1.0.0-alpha.0/go.mod h1:qonzb8JiUsTeuypJVmfzluU/wnN/tg+o2GeSubwzIiY= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= diff --git a/src/go/guestagent/main.go b/src/go/guestagent/main.go index fa7394bf3c9..0d3bf8b5cbe 100644 --- a/src/go/guestagent/main.go +++ b/src/go/guestagent/main.go @@ -44,7 +44,6 @@ import ( var ( debug = flag.Bool("debug", false, "display debug output") configPath = flag.String("kubeconfig", "/etc/rancher/k3s/k3s.yaml", "path to kubeconfig") - enableIptables = flag.Bool("iptables", true, "enable iptables scanning") enableKubernetes = flag.Bool("kubernetes", false, "enable Kubernetes service forwarding") enableDocker = flag.Bool("docker", false, "enable Docker event monitoring") enableContainerd = flag.Bool("containerd", false, "enable Containerd event monitoring")