feat: update pod status logic #214
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,6 +33,38 @@ const ( | |
| OwnerKindStatefulSet = "StatefulSet" | ||
| ) | ||
|
|
||
| // Helper Fns | ||
| func hasPodReadyCondition(conditions []v1.PodCondition) bool { | ||
| for _, condition := range conditions { | ||
| if condition.Type == v1.PodReady && condition.Status == v1.ConditionTrue { | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func isPodInitializedConditionTrue(status *v1.PodStatus) bool { | ||
| for _, condition := range status.Conditions { | ||
| if condition.Type != v1.PodInitialized { | ||
| continue | ||
| } | ||
|
|
||
| return condition.Status == v1.ConditionTrue | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func isRestartableInitContainer(initContainer *v1.Container) bool { | ||
| if initContainer == nil || initContainer.RestartPolicy == nil { | ||
| return false | ||
| } | ||
| return *initContainer.RestartPolicy == v1.ContainerRestartPolicyAlways | ||
| } | ||
|
|
||
| func isPodPhaseTerminal(phase v1.PodPhase) bool { | ||
| return phase == v1.PodFailed || phase == v1.PodSucceeded | ||
| } | ||
|
|
||
| // ---------------------------------- Pod "status" ---------------------------------- | ||
|
|
||
| type PodStatusAction struct{} | ||
|
|
@@ -43,18 +75,46 @@ func NewPodStatusAction() PodStatusAction { | |
|
|
||
| // Generates the Pod "status" facet. | ||
| func (PodStatusAction) ComputeAttributes(pod v1.Pod) (attributes, error) { | ||
| // based on https://github.com/kubernetes/kubernetes/blob/cd3b5c57668a0a6e32057ef82dfab40e9b0bec5b/pkg/printers/internalversion/printers.go#L881 | ||
| restarts := 0 | ||
| restartableInitContainerRestarts := 0 | ||
| totalContainers := len(pod.Spec.Containers) | ||
| readyContainers := 0 | ||
|
There was a problem hiding this comment. It still looks like these four variables are unused. There was a problem hiding this comment. so here's the logic in datadog agent https://github.com/DataDog/datadog-agent/blob/7d47d25899c025c8b3e5ba91e488fa0f97f7a275/pkg/collector/corechecks/cluster/orchestrator/transformers/k8s/pod.go#L220 they also only use status but kept the rest of the logic so that they can just copy paste it over There was a problem hiding this comment. think the argument for taking it out is that its unnecessary computation / more efficient which i agree with but its a slight preference vs. way better imo There was a problem hiding this comment. Interesting. I'm happy with where you landed! If we need to change it again, I think it could be more clear to have a helper that returns all values and is very explicitly full copy/paste. Then we could call that and extra only what we want |
||
|
|
||
| podPhase := pod.Status.Phase | ||
| reason := string(podPhase) | ||
| if pod.Status.Reason != "" { | ||
| reason = pod.Status.Reason | ||
| } | ||
|
|
||
| // If the Pod carries {type:PodScheduled, reason:SchedulingGated}, set reason to 'SchedulingGated'. | ||
| for _, condition := range pod.Status.Conditions { | ||
| if condition.Type == v1.PodScheduled && condition.Reason == v1.PodReasonSchedulingGated { | ||
| reason = v1.PodReasonSchedulingGated | ||
| } | ||
| } | ||
|
|
||
| initContainers := make(map[string]*v1.Container) | ||
| for i := range pod.Spec.InitContainers { | ||
| initContainers[pod.Spec.InitContainers[i].Name] = &pod.Spec.InitContainers[i] | ||
| if isRestartableInitContainer(&pod.Spec.InitContainers[i]) { | ||
| totalContainers++ | ||
| } | ||
| } | ||
|
|
||
| initializing := false | ||
| for i := range pod.Status.InitContainerStatuses { | ||
| container := pod.Status.InitContainerStatuses[i] | ||
| restarts += int(container.RestartCount) | ||
| switch { | ||
| case container.State.Terminated != nil && container.State.Terminated.ExitCode == 0: | ||
| continue | ||
| case isRestartableInitContainer(initContainers[container.Name]) && | ||
| container.Started != nil && *container.Started: | ||
| if container.Ready { | ||
| readyContainers++ | ||
| } | ||
| continue | ||
|
There was a problem hiding this comment. Should this be in the |
||
| case container.State.Terminated != nil: | ||
| // initialization is failed | ||
| if len(container.State.Terminated.Reason) == 0 { | ||
|
|
@@ -76,11 +136,13 @@ func (PodStatusAction) ComputeAttributes(pod v1.Pod) (attributes, error) { | |
| } | ||
| break | ||
| } | ||
|
|
||
| if !initializing || isPodInitializedConditionTrue(&pod.Status) { | ||
| restarts = restartableInitContainerRestarts | ||
| hasRunning := false | ||
| for i := len(pod.Status.ContainerStatuses) - 1; i >= 0; i-- { | ||
| container := pod.Status.ContainerStatuses[i] | ||
| restarts += int(container.RestartCount) | ||
| if container.State.Waiting != nil && container.State.Waiting.Reason != "" { | ||
| reason = container.State.Waiting.Reason | ||
| } else if container.State.Terminated != nil && container.State.Terminated.Reason != "" { | ||
|
|
@@ -93,12 +155,17 @@ func (PodStatusAction) ComputeAttributes(pod v1.Pod) (attributes, error) { | |
| } | ||
| } else if container.Ready && container.State.Running != nil { | ||
| hasRunning = true | ||
| readyContainers++ | ||
| } | ||
| } | ||
|
|
||
| // change pod status back to "Running" if there is at least one container still reporting as "Running" status | ||
| if reason == "Completed" && hasRunning { | ||
| if hasPodReadyCondition(pod.Status.Conditions) { | ||
| reason = "Running" | ||
| } else { | ||
| reason = "NotReady" | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe change this to
to match
hasPodReadyConditionThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bumping this one
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is actually just helper code I copied from the same kubectl code, if its semantically the same i'd prefer to leave it in case that helper code changes in the future as well it'll be easier to copy/compare