github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89381 from dashpole/comment_disable_readonly

Browse Source 
Add comment explaining when to remove cadvisor json endpoints
This commit is contained in:
Kubernetes Prow Robot 2020-03-23 20:31:19 -07:00 committed by GitHub
commit 907d4c1bb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubelet/app/options/options.go
View File

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

2
pkg/kubelet/cadvisor/cadvisor_linux.go
View File

@ -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"