Merge pull request #19085 from openshift-cherrypick-robot/cherry-pick…

…-19028-to-release-3.9 [release-3.9] UPSTREAM: 61294: Fix cpu cfs quota flag with pod cgroups
openshift · Mar 28, 2018 · 97231e6 · 97231e6
2 parents f0a161b + 59f6168
commit 97231e6
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 11 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/server.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/server.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/container_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/container_manager.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/container_manager_linux.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/container_manager_linux.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/helpers_linux.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/helpers_linux.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/helpers_linux_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/helpers_linux_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/helpers_unsupported.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/helpers_unsupported.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/pod_container_manager_linux.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/pod_container_manager_linux.go