diff --git a/Makefile b/Makefile
index 077de4836..bca08fc0c 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ build: charts-tgz manifests go-fmt go-vet ## Build commands with release args, t
 
 .PHONY: build-fsm
 build-fsm: helm-update-dep cmd/cli/chart.tgz
-	CGO_ENABLED=1 go build -v -o ./bin/fsm -ldflags ${LDFLAGS} ./cmd/cli
+	CGO_ENABLED=0 go build -v -o ./bin/fsm -ldflags ${LDFLAGS} ./cmd/cli
 
 cmd/cli/chart.tgz: scripts/generate_chart/generate_chart.go $(shell find charts/fsm)
 	go run $< --chart-name=fsm > $@
@@ -361,7 +361,7 @@ install-git-pre-push-hook:
 
 .PHONY: build-cross
 build-cross: helm-update-dep cmd/cli/chart.tgz
-	GO111MODULE=on CGO_ENABLED=1 $(GOX) -ldflags $(LDFLAGS) -parallel=5 -output="_dist/{{.OS}}-{{.Arch}}/$(BINNAME)" -osarch='$(TARGETS)' ./cmd/cli
+	GO111MODULE=on CGO_ENABLED=0 $(GOX) -ldflags $(LDFLAGS) -parallel=5 -output="_dist/{{.OS}}-{{.Arch}}/$(BINNAME)" -osarch='$(TARGETS)' ./cmd/cli
 
 .PHONY: dist
 dist:
diff --git a/cmd/cli/dashboard.go b/cmd/cli/dashboard.go
index 1012aade4..53dffb01c 100644
--- a/cmd/cli/dashboard.go
+++ b/cmd/cli/dashboard.go
@@ -76,7 +76,7 @@ func (d *dashboardCmd) run() error {
 	v1ClientSet := clientSet.CoreV1()
 
 	// Get Grafana service data
-	svc, err := v1ClientSet.Services(settings.FsmNamespace()).
+	svc, err := v1ClientSet.Services(settings.Namespace()).
 		Get(context.TODO(), grafanaServiceName, metav1.GetOptions{})
 
 	if err != nil {
@@ -86,7 +86,7 @@ func (d *dashboardCmd) run() error {
 	// Select pod/s given the service data available
 	set := labels.Set(svc.Spec.Selector)
 	listOptions := metav1.ListOptions{LabelSelector: set.AsSelector().String()}
-	pods, err := v1ClientSet.Pods(settings.FsmNamespace()).List(context.TODO(), listOptions)
+	pods, err := v1ClientSet.Pods(settings.Namespace()).List(context.TODO(), listOptions)
 	if err != nil {
 		return annotateErrorMessageWithFsmNamespace("Error listing pods: %s", err)
 	}
diff --git a/cmd/cli/egressgateway_disable.go b/cmd/cli/egressgateway_disable.go
index 4ae3f544d..3f01b5c78 100644
--- a/cmd/cli/egressgateway_disable.go
+++ b/cmd/cli/egressgateway_disable.go
@@ -67,7 +67,7 @@ func (cmd *egressGatewayDisableCmd) run() error {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	debug("Getting mesh config ...")
 	// get mesh config
diff --git a/cmd/cli/egressgateway_enable.go b/cmd/cli/egressgateway_enable.go
index 9f8257729..6871e581a 100644
--- a/cmd/cli/egressgateway_enable.go
+++ b/cmd/cli/egressgateway_enable.go
@@ -128,7 +128,7 @@ func (cmd *egressGatewayEnableCmd) run() error {
 		return fmt.Errorf("mode must be either http2tunnel or socks5")
 	}
 
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	debug("Getting mesh config ...")
 	// get mesh config
diff --git a/cmd/cli/flb_disable.go b/cmd/cli/flb_disable.go
index 04bd1b227..999f3363d 100644
--- a/cmd/cli/flb_disable.go
+++ b/cmd/cli/flb_disable.go
@@ -62,7 +62,7 @@ func (cmd *flbDisableCmd) run() error {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	debug("Getting mesh config ...")
 	// get mesh config
diff --git a/cmd/cli/flb_enable.go b/cmd/cli/flb_enable.go
index 598cf5fb2..abb2f0d90 100644
--- a/cmd/cli/flb_enable.go
+++ b/cmd/cli/flb_enable.go
@@ -129,7 +129,7 @@ func (cmd *flbEnableCmd) run() error {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	debug("Getting mesh config ...")
 	// get mesh config
diff --git a/cmd/cli/fsm.go b/cmd/cli/fsm.go
index 087a23c0a..78d894f31 100644
--- a/cmd/cli/fsm.go
+++ b/cmd/cli/fsm.go
@@ -2,19 +2,13 @@
 package main
 
 import (
+	goflag "flag"
 	"fmt"
+	"io"
 	"os"
 
-	cmdanalyze "sigs.k8s.io/gwctl/cmd/analyze"
-	cmdapply "sigs.k8s.io/gwctl/cmd/apply"
-	cmddelete "sigs.k8s.io/gwctl/cmd/delete"
-	cmdget "sigs.k8s.io/gwctl/cmd/get"
-
-	"github.com/spf13/pflag"
-
 	"github.com/spf13/cobra"
 	"helm.sh/helm/v3/pkg/action"
-	"k8s.io/cli-runtime/pkg/genericiooptions"
 
 	"github.com/flomesh-io/fsm/pkg/cli"
 )
@@ -29,7 +23,7 @@ To install and configure FSM, run:
 
 var settings = cli.New()
 
-func newRootCmd(config *action.Configuration, ioStreams genericiooptions.IOStreams, args []string) *cobra.Command {
+func newRootCmd(config *action.Configuration, stdin io.Reader, stdout io.Writer, stderr io.Writer, args []string) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:          "fsm",
 		Short:        "Install and manage Flomesh Service Mesh",
@@ -37,15 +31,10 @@ func newRootCmd(config *action.Configuration, ioStreams genericiooptions.IOStrea
 		SilenceUsage: true,
 	}
 
-	//cmd.PersistentFlags().AddGoFlagSet(goflag.CommandLine)
+	cmd.PersistentFlags().AddGoFlagSet(goflag.CommandLine)
 	flags := cmd.PersistentFlags()
 	settings.AddFlags(flags)
 
-	factory := settings.Factory()
-	stdin := ioStreams.In
-	stdout := ioStreams.Out
-	stderr := ioStreams.ErrOut
-
 	// Add subcommands here
 	cmd.AddCommand(
 		newMeshCmd(config, stdin, stdout),
@@ -53,7 +42,7 @@ func newRootCmd(config *action.Configuration, ioStreams genericiooptions.IOStrea
 		newNamespaceCmd(stdout),
 		newMetricsCmd(stdout),
 		newVersionCmd(stdout),
-		newProxyCmd(config, factory, stdout),
+		newProxyCmd(config, stdout),
 		newPolicyCmd(stdout, stderr),
 		newSupportCmd(config, stdout, stderr),
 		newUninstallCmd(config, stdin, stdout),
@@ -62,11 +51,6 @@ func newRootCmd(config *action.Configuration, ioStreams genericiooptions.IOStrea
 		newServiceLBCmd(stdout),
 		newFLBCmd(config, stdout),
 		newEgressGatewayCmd(config, stdout),
-		cmdapply.NewCmd(factory, ioStreams),
-		cmdget.NewCmd(factory, ioStreams, false),
-		cmdget.NewCmd(factory, ioStreams, true),
-		cmddelete.NewCmd(factory, ioStreams),
-		cmdanalyze.NewCmd(factory, ioStreams),
 	)
 
 	// Add subcommands related to unmanaged environments
@@ -77,25 +61,19 @@ func newRootCmd(config *action.Configuration, ioStreams genericiooptions.IOStrea
 		)
 	}
 
-	_ = cmd.PersistentFlags().Parse(args)
-	if settings.Verbose() {
-		cmd.PersistentFlags().VisitAll(func(flag *pflag.Flag) {
-			fmt.Fprintf(os.Stderr, "flag=%s, value=%s\n", flag.Name, flag.Value)
-		})
-	}
+	_ = flags.Parse(args)
 
 	return cmd
 }
 
 func initCommands() *cobra.Command {
 	actionConfig := new(action.Configuration)
-	cmd := newRootCmd(actionConfig, settings.IOStreams(), os.Args[1:])
-	_ = actionConfig.Init(settings.RESTClientGetter(), settings.FsmNamespace(), "secret", debug)
+	cmd := newRootCmd(actionConfig, os.Stdin, os.Stdout, os.Stderr, os.Args[1:])
+	_ = actionConfig.Init(settings.RESTClientGetter(), settings.Namespace(), "secret", debug)
 
 	// run when each command's execute method is called
 	cobra.OnInitialize(func() {
-		if err := actionConfig.Init(settings.RESTClientGetter(), settings.FsmNamespace(), "secret", debug); err != nil {
-			fmt.Fprintf(os.Stderr, "Failed to initialize action configuration: %v", err)
+		if err := actionConfig.Init(settings.RESTClientGetter(), settings.Namespace(), "secret", debug); err != nil {
 			os.Exit(1)
 		}
 	})
diff --git a/cmd/cli/gateway_disable.go b/cmd/cli/gateway_disable.go
index 2da44ebc3..c64cc5c89 100644
--- a/cmd/cli/gateway_disable.go
+++ b/cmd/cli/gateway_disable.go
@@ -83,7 +83,7 @@ func (cmd *gatewayDisableCmd) run() error {
 			version.ServerVersion.String(), version.MinK8sVersionForGatewayAPI.String())
 	}
 
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	debug("Getting mesh config ...")
 	// get mesh config
diff --git a/cmd/cli/gateway_enable.go b/cmd/cli/gateway_enable.go
index 8019fed09..5bd9160b4 100644
--- a/cmd/cli/gateway_enable.go
+++ b/cmd/cli/gateway_enable.go
@@ -85,7 +85,7 @@ func (cmd *gatewayEnableCmd) run() error {
 			version.ServerVersion.String(), version.MinK8sVersionForGatewayAPI.String())
 	}
 
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	debug("Getting mesh config ...")
 	// get mesh config
diff --git a/cmd/cli/ingress_disable.go b/cmd/cli/ingress_disable.go
index 21091ba87..7d996f031 100644
--- a/cmd/cli/ingress_disable.go
+++ b/cmd/cli/ingress_disable.go
@@ -75,7 +75,7 @@ func (cmd *ingressDisableCmd) run() error {
 			version.ServerVersion.String(), version.MinK8sVersion.String())
 	}
 
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	debug("Getting mesh config ...")
 	// get mesh config
diff --git a/cmd/cli/ingress_enable.go b/cmd/cli/ingress_enable.go
index 1d5ebafb0..b95e5139c 100644
--- a/cmd/cli/ingress_enable.go
+++ b/cmd/cli/ingress_enable.go
@@ -168,7 +168,7 @@ func (cmd *ingressEnableCmd) run() error {
 		return fmt.Errorf("invalid service type, only support LoadBalancer or NodePort")
 	}
 
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	debug("Getting mesh config ...")
 	// get mesh config
diff --git a/cmd/cli/ingress_namespaced_disable.go b/cmd/cli/ingress_namespaced_disable.go
index 8b189f7e8..70075f244 100644
--- a/cmd/cli/ingress_namespaced_disable.go
+++ b/cmd/cli/ingress_namespaced_disable.go
@@ -83,7 +83,7 @@ func (cmd *namespacedIngressDisableCmd) run() error {
 			version.ServerVersion.String(), version.MinK8sVersion.String())
 	}
 
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	debug("Getting mesh config ...")
 	// get mesh config
diff --git a/cmd/cli/ingress_namespaced_enable.go b/cmd/cli/ingress_namespaced_enable.go
index 00f21e7cf..cd67e1ad9 100644
--- a/cmd/cli/ingress_namespaced_enable.go
+++ b/cmd/cli/ingress_namespaced_enable.go
@@ -84,7 +84,7 @@ func (cmd *namespacedIngressEnableCmd) run() error {
 			version.ServerVersion.String(), version.MinK8sVersion.String())
 	}
 
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	debug("Getting mesh config ...")
 	// get mesh config
diff --git a/cmd/cli/install.go b/cmd/cli/install.go
index 2e7e21782..810524cd3 100644
--- a/cmd/cli/install.go
+++ b/cmd/cli/install.go
@@ -143,7 +143,7 @@ func (i *installCmd) run(config *helm.Configuration) error {
 
 	installClient := helm.NewInstall(config)
 	installClient.ReleaseName = i.meshName
-	installClient.Namespace = settings.FsmNamespace()
+	installClient.Namespace = settings.Namespace()
 	installClient.CreateNamespace = true
 	installClient.Wait = true
 	installClient.Atomic = i.atomic
@@ -168,7 +168,7 @@ func (i *installCmd) run(config *helm.Configuration) error {
 				return err
 			}
 
-			pods, _ := i.clientSet.CoreV1().Pods(settings.FsmNamespace()).List(context.Background(), metav1.ListOptions{})
+			pods, _ := i.clientSet.CoreV1().Pods(settings.Namespace()).List(context.Background(), metav1.ListOptions{})
 
 			for _, pod := range pods.Items {
 				fmt.Fprintf(i.out, "Status for pod %s in namespace %s:\n %v\n\n", pod.Name, pod.Namespace, pod.Status)
@@ -177,7 +177,7 @@ func (i *installCmd) run(config *helm.Configuration) error {
 		}
 	} else {
 		spinner := new(cli.Spinner)
-		spinner.Init(i.clientSet, settings.FsmNamespace(), values)
+		spinner.Init(i.clientSet, settings.Namespace(), values)
 		err = spinner.Run(func() error {
 			_, installErr := installClient.Run(i.chartRequested, values)
 			return installErr
@@ -188,7 +188,7 @@ func (i *installCmd) run(config *helm.Configuration) error {
 			}
 		}
 	}
-	fmt.Fprintf(i.out, "FSM installed successfully in namespace [%s] with mesh name [%s]\n", settings.FsmNamespace(), i.meshName)
+	fmt.Fprintf(i.out, "FSM installed successfully in namespace [%s] with mesh name [%s]\n", settings.Namespace(), i.meshName)
 	return nil
 }
 
diff --git a/cmd/cli/install_test.go b/cmd/cli/install_test.go
index 76d2b1aaa..1a1fe5bc5 100644
--- a/cmd/cli/install_test.go
+++ b/cmd/cli/install_test.go
@@ -70,7 +70,7 @@ var _ = Describe("Running the install command", func() {
 			out = new(bytes.Buffer)
 			store = storage.Init(driver.NewMemory())
 			if mem, ok := store.Driver.(*driver.Memory); ok {
-				mem.SetNamespace(settings.FsmNamespace())
+				mem.SetNamespace(settings.Namespace())
 			}
 
 			config = &helm.Configuration{
@@ -115,7 +115,7 @@ var _ = Describe("Running the install command", func() {
 			})
 
 			It("should be installed in the correct namespace", func() {
-				Expect(rel.Namespace).To(Equal(settings.FsmNamespace()))
+				Expect(rel.Namespace).To(Equal(settings.Namespace()))
 			})
 		})
 	})
@@ -132,7 +132,7 @@ var _ = Describe("Running the install command", func() {
 			out = new(bytes.Buffer)
 			store = storage.Init(driver.NewMemory())
 			if mem, ok := store.Driver.(*driver.Memory); ok {
-				mem.SetNamespace(settings.FsmNamespace())
+				mem.SetNamespace(settings.Namespace())
 			}
 
 			config = &helm.Configuration{
@@ -178,7 +178,7 @@ var _ = Describe("Running the install command", func() {
 			})
 
 			It("should be installed in the correct namespace", func() {
-				Expect(rel.Namespace).To(Equal(settings.FsmNamespace()))
+				Expect(rel.Namespace).To(Equal(settings.Namespace()))
 			})
 		})
 	})
@@ -195,7 +195,7 @@ var _ = Describe("Running the install command", func() {
 			out = new(bytes.Buffer)
 			store = storage.Init(driver.NewMemory())
 			if mem, ok := store.Driver.(*driver.Memory); ok {
-				mem.SetNamespace(settings.FsmNamespace())
+				mem.SetNamespace(settings.Namespace())
 			}
 
 			config = &helm.Configuration{
@@ -255,7 +255,7 @@ var _ = Describe("Running the install command", func() {
 			})
 
 			It("should be installed in the correct namespace", func() {
-				Expect(rel.Namespace).To(Equal(settings.FsmNamespace()))
+				Expect(rel.Namespace).To(Equal(settings.Namespace()))
 			})
 		})
 	})
@@ -272,7 +272,7 @@ var _ = Describe("Running the install command", func() {
 			out = new(bytes.Buffer)
 			store = storage.Init(driver.NewMemory())
 			if mem, ok := store.Driver.(*driver.Memory); ok {
-				mem.SetNamespace(settings.FsmNamespace())
+				mem.SetNamespace(settings.Namespace())
 			}
 
 			config = &helm.Configuration{
@@ -336,7 +336,7 @@ var _ = Describe("Running the install command", func() {
 			})
 
 			It("should be installed in the correct namespace", func() {
-				Expect(rel.Namespace).To(Equal(settings.FsmNamespace()))
+				Expect(rel.Namespace).To(Equal(settings.Namespace()))
 			})
 		})
 	})
@@ -351,7 +351,7 @@ var _ = Describe("Running the install command", func() {
 			out := new(bytes.Buffer)
 			store := storage.Init(driver.NewMemory())
 			if mem, ok := store.Driver.(*driver.Memory); ok {
-				mem.SetNamespace(settings.FsmNamespace())
+				mem.SetNamespace(settings.Namespace())
 			}
 
 			config = &helm.Configuration{
@@ -416,7 +416,7 @@ var _ = Describe("Running the install command", func() {
 			out = new(bytes.Buffer)
 			store = storage.Init(driver.NewMemory())
 			if mem, ok := store.Driver.(*driver.Memory); ok {
-				mem.SetNamespace(settings.FsmNamespace())
+				mem.SetNamespace(settings.Namespace())
 			}
 
 			config = &helm.Configuration{
@@ -471,7 +471,7 @@ var _ = Describe("Running the install command", func() {
 			})
 
 			It("should be installed in the correct namespace", func() {
-				Expect(rel.Namespace).To(Equal(settings.FsmNamespace()))
+				Expect(rel.Namespace).To(Equal(settings.Namespace()))
 			})
 		})
 	})
@@ -489,7 +489,7 @@ var _ = Describe("deployPrometheus is true", func() {
 		out = new(bytes.Buffer)
 		store = storage.Init(driver.NewMemory())
 		if mem, ok := store.Driver.(*driver.Memory); ok {
-			mem.SetNamespace(settings.FsmNamespace())
+			mem.SetNamespace(settings.Namespace())
 		}
 
 		config = &helm.Configuration{
diff --git a/cmd/cli/mesh_upgrade.go b/cmd/cli/mesh_upgrade.go
index 81add8568..dbe8aba3b 100644
--- a/cmd/cli/mesh_upgrade.go
+++ b/cmd/cli/mesh_upgrade.go
@@ -135,7 +135,7 @@ func (u *meshUpgradeCmd) run(config *helm.Configuration) error {
 		return err
 	}
 
-	fmt.Fprintf(u.out, "FSM successfully upgraded mesh [%s] in namespace [%s]\n", u.meshName, settings.FsmNamespace())
+	fmt.Fprintf(u.out, "FSM successfully upgraded mesh [%s] in namespace [%s]\n", u.meshName, settings.Namespace())
 	return nil
 }
 
diff --git a/cmd/cli/mesh_upgrade_test.go b/cmd/cli/mesh_upgrade_test.go
index 9f3f6c4d6..c2f56e188 100644
--- a/cmd/cli/mesh_upgrade_test.go
+++ b/cmd/cli/mesh_upgrade_test.go
@@ -16,7 +16,7 @@ import (
 
 func meshUpgradeConfig() *action.Configuration {
 	mem := driver.NewMemory()
-	mem.SetNamespace(settings.FsmNamespace())
+	mem.SetNamespace(settings.Namespace())
 	store := storage.Init(mem)
 
 	return &action.Configuration{
diff --git a/cmd/cli/policy_check_pods.go b/cmd/cli/policy_check_pods.go
index aa3b786b8..43af11d35 100644
--- a/cmd/cli/policy_check_pods.go
+++ b/cmd/cli/policy_check_pods.go
@@ -120,7 +120,7 @@ func (cmd *trafficPolicyCheckCmd) run() error {
 }
 
 func (cmd *trafficPolicyCheckCmd) checkTrafficPolicy(srcPod, dstPod *corev1.Pod) error {
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	// Check if permissive mode is enabled, in which case every meshed pod is allowed to communicate with each other
 	if permissiveMode, err := cmd.isPermissiveModeEnabled(); err != nil {
@@ -176,7 +176,7 @@ func (cmd *trafficPolicyCheckCmd) getMeshedPod(namespace, podName string) (*core
 }
 
 func (cmd *trafficPolicyCheckCmd) isPermissiveModeEnabled() (bool, error) {
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	meshConfig, err := cmd.meshConfigClient.ConfigV1alpha3().MeshConfigs(fsmNamespace).Get(context.TODO(), defaultFsmMeshConfigName, metav1.GetOptions{})
 
diff --git a/cmd/cli/proxy.go b/cmd/cli/proxy.go
index ba20780be..0d77e2069 100644
--- a/cmd/cli/proxy.go
+++ b/cmd/cli/proxy.go
@@ -3,8 +3,6 @@ package main
 import (
 	"io"
 
-	"sigs.k8s.io/gwctl/pkg/common"
-
 	"github.com/spf13/cobra"
 	"helm.sh/helm/v3/pkg/action"
 )
@@ -14,14 +12,14 @@ This command consists of subcommands related to the operations
 of the sidecar proxy on pods.
 `
 
-func newProxyCmd(config *action.Configuration, factory common.Factory, out io.Writer) *cobra.Command {
+func newProxyCmd(config *action.Configuration, out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "proxy",
 		Short: "sidecar proxy operations",
 		Long:  proxyCmdDescription,
 		Args:  cobra.NoArgs,
 	}
-	cmd.AddCommand(newProxyGetCmd(config, factory, out))
+	cmd.AddCommand(newProxyGetCmd(config, out))
 
 	return cmd
 }
diff --git a/cmd/cli/proxy_get.go b/cmd/cli/proxy_get.go
index 2dc115c0d..3d4207d6d 100644
--- a/cmd/cli/proxy_get.go
+++ b/cmd/cli/proxy_get.go
@@ -5,11 +5,10 @@ import (
 	"io"
 	"os"
 
-	"sigs.k8s.io/gwctl/pkg/common"
-
 	"github.com/spf13/cobra"
 	"helm.sh/helm/v3/pkg/action"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 
@@ -31,18 +30,18 @@ fsm proxy get clusters bookbuyer-5ccf77f46d-rc5mg -n bookbuyer -f clusters.txt
 `
 
 type proxyGetCmd struct {
-	out       io.Writer
-	config    *rest.Config
-	clientSet kubernetes.Interface
-	query     string
-	//namespace  string
+	out        io.Writer
+	config     *rest.Config
+	clientSet  kubernetes.Interface
+	query      string
+	namespace  string
 	pod        string
 	localPort  uint16
 	outFile    string
 	sigintChan chan os.Signal
 }
 
-func newProxyGetCmd(config *action.Configuration, factory common.Factory, out io.Writer) *cobra.Command {
+func newProxyGetCmd(config *action.Configuration, out io.Writer) *cobra.Command {
 	getCmd := &proxyGetCmd{
 		out:        out,
 		sigintChan: make(chan os.Signal, 1),
@@ -67,24 +66,22 @@ func newProxyGetCmd(config *action.Configuration, factory common.Factory, out io
 				return fmt.Errorf("Could not access Kubernetes cluster, check kubeconfig: %w", err)
 			}
 			getCmd.clientSet = clientset
-			return getCmd.run(factory)
+			return getCmd.run()
 		},
 		Example: getCmdExample,
 	}
 
 	//add mesh name flag
 	f := cmd.Flags()
-	//f.StringVarP(&getCmd.namespace, "namespace", "n", metav1.NamespaceDefault, "Namespace of pod")
+	f.StringVarP(&getCmd.namespace, "namespace", "n", metav1.NamespaceDefault, "Namespace of pod")
 	f.StringVarP(&getCmd.outFile, "file", "f", "", "File to write output to")
 	f.Uint16VarP(&getCmd.localPort, "local-port", "p", constants.SidecarAdminPort, "Local port to use for port forwarding")
 
 	return cmd
 }
 
-func (cmd *proxyGetCmd) run(factory common.Factory) error {
-	namespace, _, _ := factory.KubeConfigNamespace()
-
-	sidecarProxyConfig, err := cli.GetSidecarProxyConfig(cmd.clientSet, cmd.config, namespace, cmd.pod, cmd.localPort, cmd.query)
+func (cmd *proxyGetCmd) run() error {
+	sidecarProxyConfig, err := cli.GetSidecarProxyConfig(cmd.clientSet, cmd.config, cmd.namespace, cmd.pod, cmd.localPort, cmd.query)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/cli/servicelb_disable.go b/cmd/cli/servicelb_disable.go
index 716679352..9a75cad37 100644
--- a/cmd/cli/servicelb_disable.go
+++ b/cmd/cli/servicelb_disable.go
@@ -67,7 +67,7 @@ func (cmd *serviceLBDisableCmd) run() error {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	debug("Getting mesh config ...")
 	// get mesh config
diff --git a/cmd/cli/servicelb_enable.go b/cmd/cli/servicelb_enable.go
index 640dd7220..f5f815e53 100644
--- a/cmd/cli/servicelb_enable.go
+++ b/cmd/cli/servicelb_enable.go
@@ -67,7 +67,7 @@ func (cmd *serviceLBEnableCmd) run() error {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	fsmNamespace := settings.FsmNamespace()
+	fsmNamespace := settings.Namespace()
 
 	debug("Getting mesh config ...")
 	// get mesh config
diff --git a/cmd/cli/support_bugreport.go b/cmd/cli/support_bugreport.go
index 2c300fe3e..3e0647173 100644
--- a/cmd/cli/support_bugreport.go
+++ b/cmd/cli/support_bugreport.go
@@ -169,7 +169,7 @@ func (cmd *bugReportCmd) run() error {
 		Stderr:               cmd.stderr,
 		KubeClient:           cmd.kubeClient,
 		PolicyClient:         cmd.policyClient,
-		ControlPlaneNamepace: settings.FsmNamespace(),
+		ControlPlaneNamepace: settings.Namespace(),
 		AppNamespaces:        cmd.appNamespaces,
 		AppDeployments:       appDeployments,
 		AppPods:              appPods,
diff --git a/cmd/cli/uninstall_mesh.go b/cmd/cli/uninstall_mesh.go
index bf0b02736..689acb8c0 100644
--- a/cmd/cli/uninstall_mesh.go
+++ b/cmd/cli/uninstall_mesh.go
@@ -88,7 +88,7 @@ func newUninstallMeshCmd(config *action.Configuration, in io.Reader, out io.Writ
 				return fmt.Errorf("Could not access extension client set: %w", err)
 			}
 
-			uninstall.meshNamespace = settings.FsmNamespace()
+			uninstall.meshNamespace = settings.Namespace()
 			return uninstall.run()
 		},
 	}
diff --git a/cmd/cli/util.go b/cmd/cli/util.go
index 4f9c8c175..7ba8bb411 100644
--- a/cmd/cli/util.go
+++ b/cmd/cli/util.go
@@ -288,7 +288,7 @@ func annotateErrorMessageWithFsmNamespace(errMsgFormat string, args ...interface
 	fsmNamespaceErrorMsg := fmt.Sprintf(
 		"Note: The command failed when run in the FSM namespace [%s].\n"+
 			"Use the global flag --fsm-namespace if [%s] is not the intended FSM namespace.",
-		settings.FsmNamespace(), settings.FsmNamespace())
+		settings.Namespace(), settings.Namespace())
 
 	return annotateErrorMessageWithActionableMessage(fsmNamespaceErrorMsg, errMsgFormat, args...)
 }
diff --git a/cmd/cli/util_test.go b/cmd/cli/util_test.go
index efacc26fa..e9c7a37d2 100644
--- a/cmd/cli/util_test.go
+++ b/cmd/cli/util_test.go
@@ -59,7 +59,7 @@ func TestAnnotateErrorMessageWithFsmNamespace(t *testing.T) {
 	fsmNamespaceErrorMsg := fmt.Sprintf(
 		"Note: The command failed when run in the FSM namespace [%s].\n"+
 			"Use the global flag --fsm-namespace if [%s] is not the intended FSM namespace.",
-		settings.FsmNamespace(), settings.FsmNamespace())
+		settings.Namespace(), settings.Namespace())
 
 	testCases := []test{
 		{
diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_circuitbreakers.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_circuitbreakers.yaml
index 105998c73..717327b71 100644
--- a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_circuitbreakers.yaml
+++ b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_circuitbreakers.yaml
@@ -6,7 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app.kubernetes.io/name: flomesh.io
-    gateway.flomesh.io/extension: Filter
   name: circuitbreakers.extension.gateway.flomesh.io
 spec:
   group: extension.gateway.flomesh.io
diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_faultinjections.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_faultinjections.yaml
index f89fdf3e2..4fa29d7f5 100644
--- a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_faultinjections.yaml
+++ b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_faultinjections.yaml
@@ -6,7 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app.kubernetes.io/name: flomesh.io
-    gateway.flomesh.io/extension: Filter
   name: faultinjections.extension.gateway.flomesh.io
 spec:
   group: extension.gateway.flomesh.io
diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_filterconfigs.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_filterconfigs.yaml
index ca44fb82e..6b936cbb5 100644
--- a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_filterconfigs.yaml
+++ b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_filterconfigs.yaml
@@ -6,7 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app.kubernetes.io/name: flomesh.io
-    gateway.flomesh.io/extension: Filter
   name: filterconfigs.extension.gateway.flomesh.io
 spec:
   group: extension.gateway.flomesh.io
diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_filterdefinitions.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_filterdefinitions.yaml
index b9f1bbc25..ee0387328 100644
--- a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_filterdefinitions.yaml
+++ b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_filterdefinitions.yaml
@@ -6,7 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app.kubernetes.io/name: flomesh.io
-    gateway.flomesh.io/extension: Filter
   name: filterdefinitions.extension.gateway.flomesh.io
 spec:
   group: extension.gateway.flomesh.io
diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_filters.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_filters.yaml
index 98dcd49d7..1b2b1965f 100644
--- a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_filters.yaml
+++ b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_filters.yaml
@@ -6,7 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app.kubernetes.io/name: flomesh.io
-    gateway.flomesh.io/extension: Filter
   name: filters.extension.gateway.flomesh.io
 spec:
   group: extension.gateway.flomesh.io
diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_httplogs.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_httplogs.yaml
index a2662dd4e..e2ef44b79 100644
--- a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_httplogs.yaml
+++ b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_httplogs.yaml
@@ -6,7 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app.kubernetes.io/name: flomesh.io
-    gateway.flomesh.io/extension: Filter
   name: httplogs.extension.gateway.flomesh.io
 spec:
   group: extension.gateway.flomesh.io
diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_listenerfilters.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_listenerfilters.yaml
index 1c79d1cf9..171eb65fa 100644
--- a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_listenerfilters.yaml
+++ b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_listenerfilters.yaml
@@ -6,7 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app.kubernetes.io/name: flomesh.io
-    gateway.flomesh.io/extension: Filter
   name: listenerfilters.extension.gateway.flomesh.io
 spec:
   group: extension.gateway.flomesh.io
diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_metrics.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_metrics.yaml
index 10c41346b..d2db647c7 100644
--- a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_metrics.yaml
+++ b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_metrics.yaml
@@ -6,7 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app.kubernetes.io/name: flomesh.io
-    gateway.flomesh.io/extension: Filter
   name: metrics.extension.gateway.flomesh.io
 spec:
   group: extension.gateway.flomesh.io
diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_proxytags.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_proxytags.yaml
index 31b74572d..eea81031b 100644
--- a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_proxytags.yaml
+++ b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_proxytags.yaml
@@ -6,7 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app.kubernetes.io/name: flomesh.io
-    gateway.flomesh.io/extension: Filter
   name: proxytags.extension.gateway.flomesh.io
 spec:
   group: extension.gateway.flomesh.io
diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_ratelimits.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_ratelimits.yaml
index c5823d6ca..0dfd7f645 100644
--- a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_ratelimits.yaml
+++ b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_ratelimits.yaml
@@ -6,7 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app.kubernetes.io/name: flomesh.io
-    gateway.flomesh.io/extension: Filter
   name: ratelimits.extension.gateway.flomesh.io
 spec:
   group: extension.gateway.flomesh.io
diff --git a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_zipkins.yaml b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_zipkins.yaml
index 4e0bc40ce..e6ec53fa1 100644
--- a/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_zipkins.yaml
+++ b/cmd/fsm-bootstrap/crds/extension.gateway.flomesh.io_zipkins.yaml
@@ -6,7 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.15.0
   labels:
     app.kubernetes.io/name: flomesh.io
-    gateway.flomesh.io/extension: Filter
   name: zipkins.extension.gateway.flomesh.io
 spec:
   group: extension.gateway.flomesh.io
diff --git a/go.mod b/go.mod
index 9b4232aba..47230e087 100644
--- a/go.mod
+++ b/go.mod
@@ -67,9 +67,9 @@ require (
 	github.com/hashicorp/vault/sdk v0.13.0
 	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	golang.org/x/net v0.28.0
-	golang.org/x/sync v0.8.0
-	golang.org/x/sys v0.23.0
+	golang.org/x/net v0.27.0
+	golang.org/x/sync v0.7.0
+	golang.org/x/sys v0.22.0
 	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
 	honnef.co/go/tools v0.1.3 // indirect
 )
@@ -106,17 +106,17 @@ require (
 	golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
 	golang.org/x/time v0.6.0
 	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70
-	k8s.io/klog/v2 v2.130.1
+	k8s.io/klog/v2 v2.120.1
 	k8s.io/kubectl v0.30.5
 	k8s.io/kubernetes v1.30.5
-	sigs.k8s.io/gwctl v0.0.0-20240926170801-d8d23c1ba2a6
 	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
 	4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a // indirect
 	cloud.google.com/go/cloudsqlconn v1.4.3 // indirect
-	cloud.google.com/go/compute/metadata v0.3.0 // indirect
+	cloud.google.com/go/compute v1.24.0 // indirect
+	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v1.1.6 // indirect
 	cloud.google.com/go/kms v1.15.7 // indirect
 	cloud.google.com/go/monitoring v1.18.0 // indirect
@@ -207,11 +207,10 @@ require (
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
 	github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.0 // indirect
-	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
+	github.com/evanphx/json-patch v5.7.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fogleman/gg v1.3.0 // indirect
 	github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gammazero/deque v0.2.1 // indirect
@@ -246,13 +245,11 @@ require (
 	github.com/go-toolsmith/strparse v1.0.0 // indirect
 	github.com/go-toolsmith/typep v1.0.2 // indirect
 	github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
-	github.com/goccy/go-graphviz v0.1.3 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
@@ -496,12 +493,11 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/arch v0.8.0 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
-	golang.org/x/image v0.14.0 // indirect
+	golang.org/x/crypto v0.25.0 // indirect
 	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/oauth2 v0.20.0 // indirect
-	golang.org/x/term v0.23.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/oauth2 v0.19.0 // indirect
+	golang.org/x/term v0.22.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/api v0.163.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
diff --git a/go.sum b/go.sum
index de1672fb3..3c6e75dc1 100644
--- a/go.sum
+++ b/go.sum
@@ -181,12 +181,13 @@ cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOV
 cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU=
 cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI=
 cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
+cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg=
+cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40=
 cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=
 cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
 cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=
+cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
-cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
-cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
 cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY=
 cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=
 cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=
@@ -969,8 +970,6 @@ github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf h1:GOPo6vn/vTN+3IwZBvXX0y5doJfSC7My0cdzelyOCsQ=
 github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/corona10/goimagehash v1.0.2 h1:pUfB0LnsJASMPGEZLj7tGY251vF+qLGqOgEP4rUs6kA=
-github.com/corona10/goimagehash v1.0.2/go.mod h1:/l9umBhvcHQXVtQO1V6Gp1yD20STawkhRnnX0D1bvVI=
 github.com/couchbase/gocb/v2 v2.6.5 h1:xaZu29o8UJEV1ZQ3n2s9jcRCUHz/JsQ6+y6JBnVsy5A=
 github.com/couchbase/gocb/v2 v2.6.5/go.mod h1:0vFM09y+VPhnXeNrIb8tS0wKHGpJvjJBrJnriWEiwGs=
 github.com/couchbase/gocbcore/v10 v10.3.1 h1:dx+lub02eDYiQXavtF0EwYMppVUcbjCxAAqa6/nQldg=
@@ -1075,8 +1074,8 @@ github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6Ni
 github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
 github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
 github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls=
-github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI=
+github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
 github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
@@ -1095,7 +1094,6 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw
 github.com/florianl/go-tc v0.4.2 h1:jan5zcOWCLhA9SRBHZhQ0SSAq7cmDUagiRPngAi5AOQ=
 github.com/florianl/go-tc v0.4.2/go.mod h1:2W1jSMFryiYlpQigr4ZpSSpE9XNze+bW7cTsCXWbMwo=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9mImVMaBPw9L/0TBHU8=
@@ -1264,8 +1262,6 @@ github.com/gobuffalo/packr/v2 v2.8.3 h1:xE1yzvnO56cUC0sTpKR3DIbxZgB54AftTFMhB2XE
 github.com/gobuffalo/packr/v2 v2.8.3/go.mod h1:0SahksCVcx4IMnigTjiFuyldmTrdTctXsOdiU5KwbKc=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/goccy/go-graphviz v0.1.3 h1:Pkt8y4FBnBNI9tfSobpoN5qy1qMNqRXPQYvLhaSUasY=
-github.com/goccy/go-graphviz v0.1.3/go.mod h1:pMYpbAqJT10V8dzV1JN/g/wUlG/0imKPzn3ZsrchGCI=
 github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
@@ -1295,7 +1291,6 @@ github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0kt
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
@@ -2166,8 +2161,6 @@ github.com/nakabonne/nestif v0.3.0 h1:+yOViDGhg8ygGrmII72nV9B/zGxY188TYpfolntsaP
 github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c=
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E=
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
-github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 h1:BvoENQQU+fZ9uukda/RzCAL/191HHwJA5b13R6diVlY=
-github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 h1:BQ1HW7hr4IVovMwWg0E0PYcyW8CzqDcVmaew9cujU4s=
 github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod h1:TLb2Sg7HQcgGdloNxkrmtgDNR9uVYF3lfdFIN4Ro6Sk=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
@@ -2721,9 +2714,8 @@ golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDf
 golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
-golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2754,8 +2746,6 @@ golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeap
 golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4=
-golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -2884,9 +2874,8 @@ golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
 golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2919,8 +2908,8 @@ golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw
 golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
 golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
 golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
-golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo=
-golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg=
+golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -2942,9 +2931,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -3078,9 +3066,8 @@ golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
-golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/telemetry v0.0.0-20240208230135-b75ee8823808/go.mod h1:KG1lNk5ZFNssSZLrpVb4sMXKMpGwGXOxSG3rnu2gZQQ=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -3103,9 +3090,8 @@ golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
 golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
-golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
-golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -3127,9 +3113,8 @@ golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -3656,9 +3641,8 @@ k8s.io/helm v2.14.3+incompatible h1:uzotTcZXa/b2SWVoUzM1xiCXVjI38TuxMujS/1s+3Gw=
 k8s.io/helm v2.14.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
 k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
-k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
 k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 h1:Q8Z7VlGhcJgBHJHYugJ/K/7iB8a2eSxCyxdVjJp+lLY=
 k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
@@ -3725,8 +3709,6 @@ sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHv
 sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
 sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
 sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
-sigs.k8s.io/gwctl v0.0.0-20240926170801-d8d23c1ba2a6 h1:38b/UpBE1L6ozf9A4CHq3uKQ3rcZsqk0w4tR6gUW8SE=
-sigs.k8s.io/gwctl v0.0.0-20240926170801-d8d23c1ba2a6/go.mod h1:X1P8kcjPUdhmc0e88V376wJMuyMJiMaHY/yterL+Sew=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/kind v0.17.0 h1:CScmGz/wX66puA06Gj8OZb76Wmk7JIjgWf5JDvY7msM=
diff --git a/pkg/apis/extension/v1alpha1/circuitbreaker.go b/pkg/apis/extension/v1alpha1/circuitbreaker.go
index 60d542d34..faa354759 100644
--- a/pkg/apis/extension/v1alpha1/circuitbreaker.go
+++ b/pkg/apis/extension/v1alpha1/circuitbreaker.go
@@ -89,7 +89,7 @@ type CircuitBreakerStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Namespaced,categories=gateway-api
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
-// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io,gateway.flomesh.io/extension=Filter}
+// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io}
 
 // CircuitBreaker is the Schema for the CircuitBreaker API
 type CircuitBreaker struct {
diff --git a/pkg/apis/extension/v1alpha1/faultinjection.go b/pkg/apis/extension/v1alpha1/faultinjection.go
index 01a3c72e3..39ceb1a7f 100644
--- a/pkg/apis/extension/v1alpha1/faultinjection.go
+++ b/pkg/apis/extension/v1alpha1/faultinjection.go
@@ -87,7 +87,7 @@ type FaultInjectionStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Namespaced,categories=gateway-api
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
-// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io,gateway.flomesh.io/extension=Filter}
+// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io}
 
 // FaultInjection is the Schema for the FaultInjection API
 type FaultInjection struct {
diff --git a/pkg/apis/extension/v1alpha1/filter.go b/pkg/apis/extension/v1alpha1/filter.go
index ef788e972..81b94be11 100644
--- a/pkg/apis/extension/v1alpha1/filter.go
+++ b/pkg/apis/extension/v1alpha1/filter.go
@@ -31,7 +31,7 @@ type FilterSpec struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Namespaced,categories=gateway-api
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
-// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io,gateway.flomesh.io/extension=Filter}
+// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io}
 type Filter struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
diff --git a/pkg/apis/extension/v1alpha1/filterconfig.go b/pkg/apis/extension/v1alpha1/filterconfig.go
index 5a18eab4a..cad988dda 100644
--- a/pkg/apis/extension/v1alpha1/filterconfig.go
+++ b/pkg/apis/extension/v1alpha1/filterconfig.go
@@ -21,7 +21,7 @@ type FilterConfigSpec struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Namespaced,categories=gateway-api
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
-// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io,gateway.flomesh.io/extension=Filter}
+// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io}
 type FilterConfig struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
diff --git a/pkg/apis/extension/v1alpha1/filterdefinition.go b/pkg/apis/extension/v1alpha1/filterdefinition.go
index f3c5b99fd..ac6717b05 100644
--- a/pkg/apis/extension/v1alpha1/filterdefinition.go
+++ b/pkg/apis/extension/v1alpha1/filterdefinition.go
@@ -36,7 +36,7 @@ type FilterDefinitionSpec struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster,categories=gateway-api
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
-// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io,gateway.flomesh.io/extension=Filter}
+// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io}
 type FilterDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
diff --git a/pkg/apis/extension/v1alpha1/httplog.go b/pkg/apis/extension/v1alpha1/httplog.go
index ed023dc12..ccd6343d4 100644
--- a/pkg/apis/extension/v1alpha1/httplog.go
+++ b/pkg/apis/extension/v1alpha1/httplog.go
@@ -79,7 +79,7 @@ type HTTPLogStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Namespaced,categories=gateway-api
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
-// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io,gateway.flomesh.io/extension=Filter}
+// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io}
 
 // HTTPLog is the Schema for the HTTPLog API
 type HTTPLog struct {
diff --git a/pkg/apis/extension/v1alpha1/listenerfilter.go b/pkg/apis/extension/v1alpha1/listenerfilter.go
index aa40bb3c8..4601871a9 100644
--- a/pkg/apis/extension/v1alpha1/listenerfilter.go
+++ b/pkg/apis/extension/v1alpha1/listenerfilter.go
@@ -56,7 +56,7 @@ type ListenerFilterSpec struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Namespaced,categories=gateway-api
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
-// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io,gateway.flomesh.io/extension=Filter}
+// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io}
 type ListenerFilter struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
diff --git a/pkg/apis/extension/v1alpha1/metrics.go b/pkg/apis/extension/v1alpha1/metrics.go
index 11af10552..65881e53e 100644
--- a/pkg/apis/extension/v1alpha1/metrics.go
+++ b/pkg/apis/extension/v1alpha1/metrics.go
@@ -32,7 +32,7 @@ type MetricsStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Namespaced,categories=gateway-api
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
-// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io,gateway.flomesh.io/extension=Filter}
+// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io}
 
 // Metrics is the Schema for the Metrics API
 type Metrics struct {
diff --git a/pkg/apis/extension/v1alpha1/proxytag.go b/pkg/apis/extension/v1alpha1/proxytag.go
index f2294b7d4..422cb57eb 100644
--- a/pkg/apis/extension/v1alpha1/proxytag.go
+++ b/pkg/apis/extension/v1alpha1/proxytag.go
@@ -36,7 +36,7 @@ type ProxyTagStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Namespaced,categories=gateway-api
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
-// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io,gateway.flomesh.io/extension=Filter}
+// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io}
 
 // ProxyTag is the Schema for the ProxyTag API
 type ProxyTag struct {
diff --git a/pkg/apis/extension/v1alpha1/ratelimit.go b/pkg/apis/extension/v1alpha1/ratelimit.go
index c746ac22f..9794941e0 100644
--- a/pkg/apis/extension/v1alpha1/ratelimit.go
+++ b/pkg/apis/extension/v1alpha1/ratelimit.go
@@ -74,7 +74,7 @@ type RateLimitStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Namespaced,categories=gateway-api
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
-// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io,gateway.flomesh.io/extension=Filter}
+// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io}
 
 // RateLimit is the Schema for the RateLimit API
 type RateLimit struct {
diff --git a/pkg/apis/extension/v1alpha1/zipkin.go b/pkg/apis/extension/v1alpha1/zipkin.go
index 108da9a2b..84c36a15e 100644
--- a/pkg/apis/extension/v1alpha1/zipkin.go
+++ b/pkg/apis/extension/v1alpha1/zipkin.go
@@ -31,7 +31,7 @@ type ZipkinStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Namespaced,categories=gateway-api
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
-// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io,gateway.flomesh.io/extension=Filter}
+// +kubebuilder:metadata:labels={app.kubernetes.io/name=flomesh.io}
 
 // Zipkin is the Schema for the Zipkin API
 type Zipkin struct {
diff --git a/pkg/cli/environment.go b/pkg/cli/environment.go
index 3671b6ef9..e1d40c0ff 100644
--- a/pkg/cli/environment.go
+++ b/pkg/cli/environment.go
@@ -48,10 +48,6 @@ import (
 	"path"
 	"path/filepath"
 
-	"sigs.k8s.io/gwctl/pkg/common"
-
-	"k8s.io/cli-runtime/pkg/genericiooptions"
-
 	"github.com/spf13/pflag"
 	"gopkg.in/yaml.v2"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
@@ -87,8 +83,6 @@ type EnvSettings struct {
 	envConfig EnvConfig
 	config    *genericclioptions.ConfigFlags
 	verbose   bool
-	ioStreams genericiooptions.IOStreams
-	factory   common.Factory
 }
 
 // New relevant environment variables set and returns EnvSettings
@@ -99,35 +93,21 @@ func New() *EnvSettings {
 		os.Exit(1)
 	}
 
-	ioStreams := genericiooptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr}
 	env := &EnvSettings{
 		envConfig: *envConfig,
-		ioStreams: ioStreams,
 	}
 
 	// bind to kubernetes config flags
-	//env.config = &genericclioptions.ConfigFlags{
-	//	Namespace: &env.envConfig.Install.Namespace,
-	//}
-	globalConfig := genericclioptions.NewConfigFlags(true).
-		WithDiscoveryBurst(300).
-		WithDiscoveryQPS(50.0).
-		WithWarningPrinter(ioStreams)
-	//globalConfig.Namespace = &env.envConfig.Install.Namespace
-	env.factory = common.NewFactory(globalConfig)
-	env.config = globalConfig
-
+	env.config = &genericclioptions.ConfigFlags{
+		Namespace: &env.envConfig.Install.Namespace,
+	}
 	return env
 }
 
 // AddFlags binds flags to the given flagset.
 func (s *EnvSettings) AddFlags(fs *pflag.FlagSet) {
-	s.config.AddFlags(fs)
-
-	fs.StringVarP(&s.envConfig.Install.Namespace, "fsm-namespace", "N", s.envConfig.Install.Namespace, "namespace for fsm control plane")
+	fs.StringVar(&s.envConfig.Install.Namespace, "fsm-namespace", s.envConfig.Install.Namespace, "namespace for fsm control plane")
 	fs.BoolVar(&s.verbose, "verbose", s.verbose, "enable verbose output")
-
-	fs.PrintDefaults()
 }
 
 // Config returns the environment config
@@ -140,8 +120,8 @@ func (s *EnvSettings) RESTClientGetter() genericclioptions.RESTClientGetter {
 	return s.config
 }
 
-// FsmNamespace gets the fsm-namespace from the configuration
-func (s *EnvSettings) FsmNamespace() string {
+// Namespace gets the namespace from the configuration
+func (s *EnvSettings) Namespace() string {
 	return s.envConfig.Install.Namespace
 }
 
@@ -150,16 +130,6 @@ func (s *EnvSettings) Verbose() bool {
 	return s.verbose
 }
 
-// IOStreams returns the IOStreams from the configuration
-func (s *EnvSettings) IOStreams() genericiooptions.IOStreams {
-	return s.ioStreams
-}
-
-// Factory returns the factory from the configuration
-func (s *EnvSettings) Factory() common.Factory {
-	return s.factory
-}
-
 // IsManaged returns true in a managed FSM environment (ex. managed by a cloud distributor)
 func (s *EnvSettings) IsManaged() bool {
 	return s.envConfig.Install.Kind == installKindManaged
diff --git a/pkg/cli/environment_test.go b/pkg/cli/environment_test.go
index fe4247644..b4cad63b4 100644
--- a/pkg/cli/environment_test.go
+++ b/pkg/cli/environment_test.go
@@ -88,7 +88,7 @@ func TestNew(t *testing.T) {
 			settings.AddFlags(flags)
 			err := flags.Parse(test.args)
 			assert.Nil(err)
-			assert.Equal(settings.FsmNamespace(), test.expectedNamespace)
+			assert.Equal(settings.Namespace(), test.expectedNamespace)
 		})
 	}
 }
@@ -103,7 +103,7 @@ func TestNamespaceErr(t *testing.T) {
 	configPath := "This doesn't even look like a valid path name"
 	env.config.KubeConfig = &configPath
 
-	tassert.Equal(t, env.FsmNamespace(), "fsm-system")
+	tassert.Equal(t, env.Namespace(), "fsm-system")
 }
 
 func TestRESTClientGetter(t *testing.T) {