Merge pull request #19028 from derekwaynecarr/bz-1554471

Automatic merge from submit-queue. UPSTREAM: 61294: Fix cpu cfs quota flag with pod cgroups https://bugzilla.redhat.com/show_bug.cgi?id=1554471 Upstream: kubernetes/kubernetes#61294
openshift · Mar 24, 2018 · 248eabb · 248eabb
2 parents 63504cd + f491df9
commit 248eabb
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