Merge pull request kubernetes#89381 from dashpole/comment_disable_readonly

Add comment explaining when to remove cadvisor json endpoints

Author: k8s-ci-robot

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")
 
 }

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"