Skip to content

Commit 789dc87

Browse files
authored
Merge pull request kubernetes#87440 from dims/switch-enable-cadvisor-json-endpoints-flag-to-false
Default the --enable-cadvisor-endpoints flag to disabled
2 parents 15f96a8 + 6ae1b3e commit 789dc87

File tree

3 files changed

+1
-81
lines changed

3 files changed

+1
-81
lines changed

cmd/kubelet/app/options/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ func NewKubeletFlags() *KubeletFlags {
219219
SeccompProfileRoot: filepath.Join(defaultRootDir, "seccomp"),
220220
// prior to the introduction of this flag, there was a hardcoded cap of 50 images
221221
NodeStatusMaxImages: 50,
222-
EnableCAdvisorJSONEndpoints: true,
222+
EnableCAdvisorJSONEndpoints: false,
223223
}
224224
}
225225

test/e2e/instrumentation/monitoring/BUILD

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ go_library(
99
name = "go_default_library",
1010
srcs = [
1111
"accelerator.go",
12-
"cadvisor.go",
1312
"custom_metrics_deployments.go",
1413
"custom_metrics_stackdriver.go",
1514
"metrics_grabber.go",
@@ -35,7 +34,6 @@ go_library(
3534
"//staging/src/k8s.io/metrics/pkg/client/external_metrics:go_default_library",
3635
"//test/e2e/framework:go_default_library",
3736
"//test/e2e/framework/autoscaling:go_default_library",
38-
"//test/e2e/framework/config:go_default_library",
3937
"//test/e2e/framework/gpu:go_default_library",
4038
"//test/e2e/framework/metrics:go_default_library",
4139
"//test/e2e/framework/node:go_default_library",

test/e2e/instrumentation/monitoring/cadvisor.go

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)