kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10957 from adrianmoisey/add_kubelet_arg_enable_cadvisor_json_endpoints 

Add support for enable-cadvisor-json-endpoints with Kubelet
This commit is contained in:
Kubernetes Prow Robot 2021-03-02 23:47:19 -08:00 committed by GitHub
parent 704ee368a4 9e18928fb3
commit 83e1424280
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -2318,6 +2318,10 @@ spec:
description: DockerDisableSharedPID uses a shared PID namespace
for containers in a pod.
type: boolean
enableCadvisorJsonEndpoints:
description: EnableCadvisorJsonEndpoints enables cAdvisor json
`/spec` and `/stats/*` endpoints. Defaults to False.
type: boolean
enableCustomMetrics:
description: Enable gathering custom metrics.
type: boolean
@ -2720,6 +2724,10 @@ spec:
description: DockerDisableSharedPID uses a shared PID namespace
for containers in a pod.
type: boolean
enableCadvisorJsonEndpoints:
description: EnableCadvisorJsonEndpoints enables cAdvisor json
`/spec` and `/stats/*` endpoints. Defaults to False.
type: boolean
enableCustomMetrics:
description: Enable gathering custom metrics.
type: boolean

4
k8s/crds/kops.k8s.io_instancegroups.yaml
View File

@ -346,6 +346,10 @@ spec:
description: DockerDisableSharedPID uses a shared PID namespace
for containers in a pod.
type: boolean
enableCadvisorJsonEndpoints:
description: EnableCadvisorJsonEndpoints enables cAdvisor json
`/spec` and `/stats/*` endpoints. Defaults to False.
type: boolean
enableCustomMetrics:
description: Enable gathering custom metrics.
type: boolean

2
pkg/apis/kops/componentconfig.go
View File

@ -215,6 +215,8 @@ type KubeletConfigSpec struct {
ContainerLogMaxSize string `json:"containerLogMaxSize,omitempty" flag:"container-log-max-size"`
// ContainerLogMaxFiles is the maximum number of container log files that can be present for a container. The number must be >= 2.
ContainerLogMaxFiles *int32 `json:"containerLogMaxFiles,omitempty" flag:"container-log-max-files"`
// EnableCadvisorJsonEndpoints enables cAdvisor json `/spec` and `/stats/*` endpoints. Defaults to False.
EnableCadvisorJsonEndpoints *bool `json:"enableCadvisorJsonEndpoints,omitempty" flag:"enable-cadvisor-json-endpoints"`
}
// KubeProxyConfig defines the configuration for a proxy

2
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -215,6 +215,8 @@ type KubeletConfigSpec struct {
ContainerLogMaxSize string `json:"containerLogMaxSize,omitempty" flag:"container-log-max-size"`
// ContainerLogMaxFiles is the maximum number of container log files that can be present for a container. The number must be >= 2.
ContainerLogMaxFiles *int32 `json:"containerLogMaxFiles,omitempty" flag:"container-log-max-files"`
// EnableCadvisorJsonEndpoints enables cAdvisor json `/spec` and `/stats/*` endpoints. Defaults to False.
EnableCadvisorJsonEndpoints *bool `json:"enableCadvisorJsonEndpoints,omitempty" flag:"enable-cadvisor-json-endpoints"`
}
// KubeProxyConfig defines the configuration for a proxy

2
pkg/apis/kops/v1alpha2/zz_generated.conversion.go generated
View File

@ -4933,6 +4933,7 @@ func autoConvert_v1alpha2_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *Kubele
out.EventBurst = in.EventBurst
out.ContainerLogMaxSize = in.ContainerLogMaxSize
out.ContainerLogMaxFiles = in.ContainerLogMaxFiles
out.EnableCadvisorJsonEndpoints = in.EnableCadvisorJsonEndpoints
return nil
}
@ -5026,6 +5027,7 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha2_KubeletConfigSpec(in *kops.K
out.EventBurst = in.EventBurst
out.ContainerLogMaxSize = in.ContainerLogMaxSize
out.ContainerLogMaxFiles = in.ContainerLogMaxFiles
out.EnableCadvisorJsonEndpoints = in.EnableCadvisorJsonEndpoints
return nil
}

5
pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go generated
View File

@ -3330,6 +3330,11 @@ func (in *KubeletConfigSpec) DeepCopyInto(out *KubeletConfigSpec) {
*out = new(int32)
**out = **in
}
if in.EnableCadvisorJsonEndpoints != nil {
in, out := &in.EnableCadvisorJsonEndpoints, &out.EnableCadvisorJsonEndpoints
*out = new(bool)
**out = **in
}
return
}

6
pkg/apis/kops/validation/validation.go
View File

@ -517,6 +517,12 @@ func validateKubelet(k *kops.KubeletConfigSpec, c *kops.Cluster, kubeletPath *fi
}
}
if k.EnableCadvisorJsonEndpoints != nil {
if c.IsKubernetesLT("1.18") && c.IsKubernetesGTE("1.21") {
allErrs = append(allErrs, field.Forbidden(kubeletPath.Child("enableCadvisorJsonEndpoints"), "enableCadvisorJsonEndpoints requires Kubernetes 1.18-1.20"))
}
}
}
return allErrs
}

5
pkg/apis/kops/zz_generated.deepcopy.go generated
View File

@ -3512,6 +3512,11 @@ func (in *KubeletConfigSpec) DeepCopyInto(out *KubeletConfigSpec) {
*out = new(int32)
**out = **in
}
if in.EnableCadvisorJsonEndpoints != nil {
in, out := &in.EnableCadvisorJsonEndpoints, &out.EnableCadvisorJsonEndpoints
*out = new(bool)
**out = **in
}
return
}