From 6951afe95f6ee402ed5d4e6ba99792210bc62d4b Mon Sep 17 00:00:00 2001 From: chenk Date: Mon, 8 Apr 2024 13:52:19 +0300 Subject: [PATCH] feat: support exclude/include kinds/namespaces Signed-off-by: chenk --- pkg/flag/kubernetes_flags.go | 13 ------------- pkg/k8s/commands/run.go | 2 -- 2 files changed, 15 deletions(-) diff --git a/pkg/flag/kubernetes_flags.go b/pkg/flag/kubernetes_flags.go index 2c53aaf58b3b..f9ebc0822fe4 100644 --- a/pkg/flag/kubernetes_flags.go +++ b/pkg/flag/kubernetes_flags.go @@ -10,14 +10,6 @@ import ( ) var ( - ClusterContextFlag = Flag[string]{ - Name: "context", - ConfigName: "kubernetes.context", - Usage: "specify a context to scan", - Aliases: []Alias{ - {Name: "ctx"}, - }, - } KubeConfigFlag = Flag[string]{ Name: "kubeconfig", ConfigName: "kubernetes.kubeconfig", @@ -104,7 +96,6 @@ var ( ) type K8sFlagGroup struct { - ClusterContext *Flag[string] KubeConfig *Flag[string] Components *Flag[[]string] K8sVersion *Flag[string] @@ -122,7 +113,6 @@ type K8sFlagGroup struct { } type K8sOptions struct { - ClusterContext string KubeConfig string Components []string K8sVersion string @@ -141,7 +131,6 @@ type K8sOptions struct { func NewK8sFlagGroup() *K8sFlagGroup { return &K8sFlagGroup{ - ClusterContext: ClusterContextFlag.Clone(), KubeConfig: KubeConfigFlag.Clone(), Components: ComponentsFlag.Clone(), K8sVersion: K8sVersionFlag.Clone(), @@ -165,7 +154,6 @@ func (f *K8sFlagGroup) Name() string { func (f *K8sFlagGroup) Flags() []Flagger { return []Flagger{ - f.ClusterContext, f.KubeConfig, f.Components, f.K8sVersion, @@ -210,7 +198,6 @@ func (f *K8sFlagGroup) ToOptions() (K8sOptions, error) { } return K8sOptions{ - ClusterContext: f.ClusterContext.Value(), KubeConfig: f.KubeConfig.Value(), Components: f.Components.Value(), K8sVersion: f.K8sVersion.Value(), diff --git a/pkg/k8s/commands/run.go b/pkg/k8s/commands/run.go index 23f42e7cd26a..54be5362637f 100644 --- a/pkg/k8s/commands/run.go +++ b/pkg/k8s/commands/run.go @@ -23,11 +23,9 @@ import ( // Run runs a k8s scan func Run(ctx context.Context, args []string, opts flag.Options) error { clusterOptions := []k8s.ClusterOption{ - k8s.WithContext(opts.K8sOptions.ClusterContext), k8s.WithKubeConfig(opts.K8sOptions.KubeConfig), k8s.WithBurst(opts.K8sOptions.Burst), k8s.WithQPS(opts.K8sOptions.QPS), - k8s.WithContext(opts.K8sOptions.ClusterContext), } if len(args) > 0 { clusterOptions = append(clusterOptions, k8s.WithContext(args[0]))