From 01f521aac6d275be4da31d87bffa7ae29b6216f3 Mon Sep 17 00:00:00 2001 From: chymy Date: Wed, 27 Jan 2021 15:33:04 +0800 Subject: [PATCH] Remove heapster flag in 'top node' Signed-off-by: chymy --- .../proxying_traffic_to_services.md | 1 - .../docs/book/pages/kubectl_book/getting_started.md | 1 - staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD | 1 - staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go | 13 ------------- staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go | 1 - 5 files changed, 17 deletions(-) diff --git a/staging/src/k8s.io/kubectl/docs/book/pages/container_debugging/proxying_traffic_to_services.md b/staging/src/k8s.io/kubectl/docs/book/pages/container_debugging/proxying_traffic_to_services.md index cf1cdb7b4ed..9fe7170d52a 100644 --- a/staging/src/k8s.io/kubectl/docs/book/pages/container_debugging/proxying_traffic_to_services.md +++ b/staging/src/k8s.io/kubectl/docs/book/pages/container_debugging/proxying_traffic_to_services.md @@ -64,7 +64,6 @@ kubectl cluster-info Kubernetes master is running at https://104.197.5.247 GLBCDefaultBackend is running at https://104.197.5.247/api/v1/namespaces/kube-system/services/default-http-backend:http/proxy -Heapster is running at https://104.197.5.247/api/v1/namespaces/kube-system/services/heapster/proxy KubeDNS is running at https://104.197.5.247/api/v1/namespaces/kube-system/services/kube-dns:dns/proxy Metrics-server is running at https://104.197.5.247/api/v1/namespaces/kube-system/services/https:metrics-server:/proxy ``` diff --git a/staging/src/k8s.io/kubectl/docs/book/pages/kubectl_book/getting_started.md b/staging/src/k8s.io/kubectl/docs/book/pages/kubectl_book/getting_started.md index 46cb99d09a3..3b4c546e54d 100644 --- a/staging/src/k8s.io/kubectl/docs/book/pages/kubectl_book/getting_started.md +++ b/staging/src/k8s.io/kubectl/docs/book/pages/kubectl_book/getting_started.md @@ -34,7 +34,6 @@ kubectl get deployments --namespace kube-system NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE event-exporter-v0.2.3 1 1 1 1 14d fluentd-gcp-scaler 1 1 1 1 14d -heapster-v1.6.0-beta.1 1 1 1 1 14d kube-dns 2 2 2 2 14d kube-dns-autoscaler 1 1 1 1 14d l7-default-backend 1 1 1 1 14d diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD index fe5eabc2e25..126b590c355 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD @@ -25,7 +25,6 @@ go_library( "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1:go_default_library", "//staging/src/k8s.io/metrics/pkg/client/clientset/versioned:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", - "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go index 24dae38c2d5..1a7386623cd 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node.go @@ -21,7 +21,6 @@ import ( "errors" "github.com/spf13/cobra" - "github.com/spf13/pflag" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -51,17 +50,6 @@ type TopNodeOptions struct { genericclioptions.IOStreams } -func heapsterTopOptions(flags *pflag.FlagSet) { - flags.String("heapster-namespace", "kube-system", "Namespace Heapster service is located in") - flags.MarkDeprecated("heapster-namespace", "This flag is currently no-op and will be deleted.") - flags.String("heapster-service", "heapster", "Name of Heapster service") - flags.MarkDeprecated("heapster-service", "This flag is currently no-op and will be deleted.") - flags.String("heapster-scheme", "http", "Scheme (http or https) to connect to Heapster as") - flags.MarkDeprecated("heapster-scheme", "This flag is currently no-op and will be deleted.") - flags.String("heapster-port", "", "Port name in service to use") - flags.MarkDeprecated("heapster-port", "This flag is currently no-op and will be deleted.") -} - var ( topNodeLong = templates.LongDesc(i18n.T(` Display Resource (CPU/Memory/Storage) usage of nodes. @@ -99,7 +87,6 @@ func NewCmdTopNode(f cmdutil.Factory, o *TopNodeOptions, streams genericclioptio cmd.Flags().StringVarP(&o.Selector, "selector", "l", o.Selector, "Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2)") cmd.Flags().StringVar(&o.SortBy, "sort-by", o.Selector, "If non-empty, sort nodes list using specified field. The field can be either 'cpu' or 'memory'.") cmd.Flags().BoolVar(&o.NoHeaders, "no-headers", o.NoHeaders, "If present, print output without headers") - heapsterTopOptions(cmd.Flags()) return cmd } diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go index 0b7b91f3a08..3b9bd1296da 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod.go @@ -179,7 +179,6 @@ func (o TopPodOptions) RunTopPod() error { return err } - // TODO: Refactor this once Heapster becomes the API server. // First we check why no metrics have been received. if len(metrics.Items) == 0 { // If the API server query is successful but all the pods are newly created,