From 679081c8be0d4e943f4f23740a423e02eca7efac Mon Sep 17 00:00:00 2001 From: carlory Date: Thu, 3 Feb 2022 15:18:13 +0800 Subject: [PATCH] deprecate --master and --karmada-config flags for karmada-aggregrated-apiserver Signed-off-by: carlory --- cmd/aggregated-apiserver/app/options/options.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/aggregated-apiserver/app/options/options.go b/cmd/aggregated-apiserver/app/options/options.go index b730778c5fd3..69367e64c4be 100644 --- a/cmd/aggregated-apiserver/app/options/options.go +++ b/cmd/aggregated-apiserver/app/options/options.go @@ -16,7 +16,6 @@ import ( genericoptions "k8s.io/apiserver/pkg/server/options" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/kubernetes" - "k8s.io/client-go/tools/clientcmd" netutils "k8s.io/utils/net" "github.com/karmada-io/karmada/pkg/aggregatedapiserver" @@ -57,7 +56,11 @@ func (o *Options) AddFlags(flags *pflag.FlagSet) { o.RecommendedOptions.AddFlags(flags) flags.StringVar(&o.karmadaConfig, "karmada-config", o.karmadaConfig, "Path to a karmada-apiserver KubeConfig.") + // Remove it when we are in v1.2(+). + _ = flags.MarkDeprecated("karmada-config", "This flag is currently no-op and will be deleted.") flags.StringVar(&o.Master, "master", o.Master, "The address of the Karmada API server. Overrides any value in KubeConfig.") + // Remove it when we are in v1.2(+). + _ = flags.MarkDeprecated("master", "This flag is currently no-op and will be deleted.") flags.Float32Var(&o.KubeAPIQPS, "kube-api-qps", 40.0, "QPS to use while talking with karmada-apiserver. Doesn't cover events and node heartbeat apis which rate limiting is controlled by a different set of flags.") flags.IntVar(&o.KubeAPIBurst, "kube-api-burst", 60, "Burst to use while talking with karmada-apiserver. Doesn't cover events and node heartbeat apis which rate limiting is controlled by a different set of flags.") utilfeature.DefaultMutableFeatureGate.AddFlag(flags) @@ -82,10 +85,7 @@ func (o *Options) Run(ctx context.Context) error { return err } - restConfig, err := clientcmd.BuildConfigFromFlags(o.Master, o.karmadaConfig) - if err != nil { - return fmt.Errorf("error building kubeconfig: %w", err) - } + restConfig := config.GenericConfig.ClientConfig restConfig.QPS, restConfig.Burst = o.KubeAPIQPS, o.KubeAPIBurst kubeClientSet := kubernetes.NewForConfigOrDie(restConfig)