Make container runtime's cgroup configurable.

Use the real cgroups for metrics generation.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
This commit is contained in:
Vishnu kannan
2016-02-04 17:49:17 -08:00
parent 9d3633a16d
commit 38efc837b9
14 changed files with 172 additions and 5645 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -304,6 +304,8 @@ type KubeletConfiguration struct {
NonMasqueradeCIDR string `json:"nonMasqueradeCIDR"`
// enable gathering custom metrics.
EnableCustomMetrics bool `json:"enableCustomMetrics"`
// The cgroup that container runtime is expected to be isolated in.
RuntimeContainer string `json:"runtimeContainer,omitempty"`
}
type KubeSchedulerConfiguration struct {