feat(transparent-proxy): add option to uninstall transparent proxy

app/kumactl/cmd/completion/testdata/bash.golden

@@ -5802,10 +5802,6 @@ _kumactl_install_transparent-proxy()
     flags_with_completion=()
     flags_completion=()
 
-    flags+=("--comments-prefix=")
-    two_word_flags+=("--comments-prefix")
-    local_nonpersistent_flags+=("--comments-prefix")
-    local_nonpersistent_flags+=("--comments-prefix=")
     flags+=("--disable-comments")
     local_nonpersistent_flags+=("--disable-comments")
     flags+=("--drop-invalid-packets")

app/kumactl/cmd/install/install_transparent_proxy.go

@@ -184,7 +184,9 @@ runuser -u kuma-dp -- \
 			}
 
 			if !initializedConfig.DryRun {
-				initializedConfig.Logger.Info("Tansparent proxy set up successfully, you can now run kuma-dp using transparent-proxy.")
+				initializedConfig.Logger.Info(
+					"transparent proxy setup completed successfully. You can now run kuma-dp with the transparent-proxy feature enabled",
+				)
 			}
 
 			return nil
@@ -230,7 +232,6 @@ runuser -u kuma-dp -- \
 	cmd.Flags().BoolVar(&cfg.Log.Enabled, "iptables-logs", cfg.Log.Enabled, "enable logs for iptables rules using the LOG chain. This option activates kernel logging for packets matching the rules, where details about the IP/IPv6 headers are logged. This information can be accessed via dmesg(1) or syslog.")
 
 	cmd.Flags().BoolVar(&cfg.Comment.Disabled, "disable-comments", cfg.Comment.Disabled, "Disable the addition of comments to iptables rules")
-	cmd.Flags().StringVar(&cfg.Comment.Prefix, "comments-prefix", cfg.Comment.Prefix, "Prefix for comments added to iptables rules")
 
 	cmd.Flags().StringArrayVar(&cfg.Redirect.Inbound.ExcludePortsForIPs, "exclude-inbound-ips", []string{}, "specify IP addresses (IPv4 or IPv6, with or without CIDR notation) to be excluded from transparent proxy inbound redirection. Examples: '10.0.0.1', '192.168.0.0/24', 'fe80::1', 'fd00::/8'. This flag can be specified multiple times or with multiple addresses separated by commas to exclude multiple IP addresses or ranges.")
 	cmd.Flags().StringArrayVar(&cfg.Redirect.Outbound.ExcludePortsForIPs, "exclude-outbound-ips", []string{}, "specify IP addresses (IPv4 or IPv6, with or without CIDR notation) to be excluded from transparent proxy outbound redirection. Examples: '10.0.0.1', '192.168.0.0/24', 'fe80::1', 'fd00::/8'. This flag can be specified multiple times or with multiple addresses separated by commas to exclude multiple IP addresses or ranges.")

app/kumactl/cmd/install/install_transparent_proxy_test.go

@@ -1,7 +1,9 @@
 package install_test
 
 import (
+	"bytes"
 	"regexp"
+	"slices"
 	"strings"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -20,6 +22,21 @@ var _ = Context("kumactl install transparent proxy", func() {
 		errorMatcher gomega_types.GomegaMatcher
 	}
 
+	cleanStderr := func(stderr *bytes.Buffer) string {
+		return strings.Join(
+			slices.DeleteFunc(
+				strings.Split(stderr.String(), "\n"),
+				func(line string) bool {
+					return strings.Contains(
+						line,
+						"no valid iptables executables found",
+					)
+				},
+			),
+			"\n",
+		)
+	}
+
 	DescribeTable("should install transparent proxy",
 		func(given testCase) {
 			// given
@@ -29,9 +46,7 @@ var _ = Context("kumactl install transparent proxy", func() {
 			// when
 			err := rootCmd.Execute()
 			stdout := stdoutBuf.String()
-			stderr := strings.NewReplacer(
-				"# [WARNING]: dry-run mode: No valid iptables executables found. The generated iptables rules may differ from those generated in an environment with valid iptables executables\n", "",
-			).Replace(stderrBuf.String())
+			stderr := cleanStderr(stderrBuf)
 
 			if given.skip != nil && given.skip(stdout, stderr) {
 				Skip("test skipped")
@@ -46,7 +61,7 @@ var _ = Context("kumactl install transparent proxy", func() {
 				Expect(stderr).To(given.errorMatcher)
 			}
 
-			Expect(stdoutBuf.String()).To(WithTransform(func(in string) string {
+			Expect(stdout).To(WithTransform(func(in string) string {
 				// Replace some stuff that are environment dependent with placeholders
 				out := regexp.MustCompile(`-o ([^ ]+)`).ReplaceAllString(in, "-o ifPlaceholder")
 				out = regexp.MustCompile(`-([sd]) ([^ ]+)`).ReplaceAllString(out, "-$1 subnetPlaceholder/mask")
@@ -77,12 +92,12 @@ var _ = Context("kumactl install transparent proxy", func() {
 				"--redirect-dns-port", "12345",
 			},
 			skip: func(stdout, stderr string) bool {
-				return !strings.HasPrefix(
+				return !strings.Contains(
 					stderr,
-					"# [WARNING]: conntrack zone splitting for IPv4 is disabled. Functionality requires the 'conntrack' iptables module",
+					"conntrack zone splitting is disabled. Functionality requires the 'conntrack' iptables module",
 				)
 			},
-			errorMatcher: HavePrefix("# [WARNING]: conntrack zone splitting for IPv4 is disabled. Functionality requires the 'conntrack' iptables module"),
+			errorMatcher: ContainSubstring("conntrack zone splitting is disabled. Functionality requires the 'conntrack' iptables module"),
 			goldenFile:   "install-transparent-proxy.dns.no-conntrack.golden.txt",
 		}),
 		Entry("should generate defaults with user id and DNS redirected", testCase{
@@ -92,9 +107,9 @@ var _ = Context("kumactl install transparent proxy", func() {
 				"--redirect-dns-port", "12345",
 			},
 			skip: func(stdout, stderr string) bool {
-				return strings.HasPrefix(
+				return strings.Contains(
 					stderr,
-					"# [WARNING]: conntrack zone splitting for IPv4 is disabled. Functionality requires the 'conntrack' iptables module",
+					"conntrack zone splitting is disabled. Functionality requires the 'conntrack' iptables module",
 				)
 			},
 			goldenFile: "install-transparent-proxy.dns.golden.txt",
@@ -181,11 +196,9 @@ var _ = Context("kumactl install transparent proxy", func() {
 
 			// when
 			err := rootCmd.Execute()
-			stderr := strings.NewReplacer(
-				"# [WARNING]: dry-run mode: No valid iptables executables found. The generated iptables rules may differ from those generated in an environment with valid iptables executables\n", "",
-			).Replace(stderrBuf.String())
-			// then
+			stderr := cleanStderr(stderrBuf) // then
 			Expect(err).To(HaveOccurred())
+
 			// and
 			Expect(stderr).To(given.errorMatcher)
 		},

app/kumactl/cmd/uninstall/uninstall_transparent_proxy.go

@@ -37,19 +37,14 @@ func newUninstallTransparentProxy() *cobra.Command {
 				return errors.Wrap(err, "failed to initialize config")
 			}
 
-			output, err := transparentproxy.Cleanup(initializedConfig)
-			if err != nil {
+			if err := transparentproxy.Cleanup(cmd.Context(), initializedConfig); err != nil {
 				return errors.Wrap(err, "transparent proxy cleanup failed")
 			}
 
 			if cfg.Ebpf.Enabled {
 				return nil
 			}
 
-			if cfg.DryRun {
-				fmt.Fprintln(cfg.RuntimeStdout, output)
-			}
-
 			if _, err := os.Stat("/etc/resolv.conf.kuma-backup"); !os.IsNotExist(err) {
 				content, err := os.ReadFile("/etc/resolv.conf.kuma-backup")
 				if err != nil {
@@ -66,7 +61,9 @@ func newUninstallTransparentProxy() *cobra.Command {
 				fmt.Fprintln(cfg.RuntimeStdout, string(content))
 			}
 
-			fmt.Fprintln(cfg.RuntimeStdout, "Transparent proxy cleaned up successfully")
+			if !initializedConfig.DryRun {
+				initializedConfig.Logger.Info("transparent proxy cleanup completed successfully")
+			}
 
 			return nil
 		},