Fix usage metrics collection for static pods #3079
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR fixed the support for OpenShift 3.9 & containerd.
Though, it introduced a regression as usage metrics (memory.usage and filesystem.usage) for static pods are not collected anymore.
Because of kubernetes/kubernetes#61717 the
/pods
does not contain the ContainerStatus section for static pods. Therefore, the current logic was not able to get the container id of the static pod.With this new logic, if the pod is static we use the pod uid (which is the only uid available).
Note though:
The UID of the static pod from the kubelet's API is not the same as the one from the APIServer. This is not impacting the logic here, just a behaviour to be aware of.
Motivation
Fix collection of usage mertrics for static pods.
Review checklist
no-changelog
label attachedAdditional Notes
Anything else we should know when reviewing?