Skip to content

Commit 9e98436

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #18055 from sjenning/sync-cpu-manager
Automatic merge from submit-queue. Backport cpumanager checkpointing fixes kubernetes/kubernetes#56191 kubernetes/kubernetes#54410 This plus #18051 fully syncs cpumanager with kube upstream. @derekwaynecarr
2 parents 3c75f9a + aecd8ed commit 9e98436

File tree

5 files changed

+117
-80
lines changed

5 files changed

+117
-80
lines changed

‎vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/cpu_manager.go

Lines changed: 21 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/policy_static.go

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state/state_file.go

Lines changed: 41 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state/state_file_test.go

Lines changed: 46 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)