From b4ed7273daaf7000394d01993fa14654b665e323 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Mon, 23 Mar 2020 12:40:04 -0700 Subject: [PATCH] add comment explaining when to remove the --enable-cadvisor-json-endpoints --- cmd/kubelet/app/options/options.go | 1 + pkg/kubelet/cadvisor/cadvisor_linux.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index effd6190094..6ed305d0ebe 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -416,6 +416,7 @@ func (f *KubeletFlags) AddFlags(mainfs *pflag.FlagSet) { fs.BoolVar(&f.KeepTerminatedPodVolumes, "keep-terminated-pod-volumes", f.KeepTerminatedPodVolumes, "Keep terminated pod volumes mounted to the node after the pod terminates. Can be useful for debugging volume related issues.") fs.MarkDeprecated("keep-terminated-pod-volumes", "will be removed in a future version") fs.BoolVar(&f.EnableCAdvisorJSONEndpoints, "enable-cadvisor-json-endpoints", f.EnableCAdvisorJSONEndpoints, "Enable cAdvisor json /spec and /stats/* endpoints.") + // TODO: Remove this flag in 1.20+. https://github.com/kubernetes/kubernetes/issues/68522 fs.MarkDeprecated("enable-cadvisor-json-endpoints", "will be removed in a future version") } diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index c78e882ca1e..7f52070b146 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -33,7 +33,7 @@ import ( _ "github.com/google/cadvisor/container/systemd/install" // Register cloud info providers. - // TODO(#76660): Remove this once the cAdvisor endpoints are removed. + // TODO(#68522): Remove this in 1.20+ once the cAdvisor endpoints are removed. _ "github.com/google/cadvisor/utils/cloudinfo/aws" _ "github.com/google/cadvisor/utils/cloudinfo/azure" _ "github.com/google/cadvisor/utils/cloudinfo/gce"