scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 18:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #130650 from natasha41575/pod-conditions-controller

Browse Source 
[FG:PodObservedGenerationTracking] controller sets observedGeneration on pod conditions
This commit is contained in:
Kubernetes Prow Robot
2025-03-11 11:27:54 -07:00
committed by GitHub
parent 6bb5901e2d af9ac325b1
commit 652f681c2b
4 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/api/v1/pod/util.go
View File

@@ -428,3 +428,21 @@ func GetPodObservedGenerationIfEnabled(pod *v1.Pod) int64 {
} }
return 0 return 0
} }
// We will emit condition.observedGeneration if the feature is enabled OR if condition.observedGeneration is already set.
// This protects against an infinite loop of kubelet trying to clear the value after the FG is turned off, and
// the API server preserving existing values when an incoming update tries to clear it.
func GetPodObservedGenerationIfEnabledOnCondition(pod *v1.Pod, conditionType v1.PodConditionType) int64 {
if pod == nil {
return 0
}
if utilfeature.DefaultFeatureGate.Enabled(features.PodObservedGenerationTracking) {
return pod.Generation
}
for _, condition := range pod.Status.Conditions {
if condition.Type == conditionType && condition.ObservedGeneration != 0 {
return pod.Generation
}
}
return 0
}

5
pkg/controller/disruption/disruption.go
View File

@@ -786,8 +786,9 @@ func (dc *DisruptionController) syncStalePodDisruption(ctx context.Context, key
newPod := pod.DeepCopy() newPod := pod.DeepCopy()
updated := apipod.UpdatePodCondition(&newPod.Status, &v1.PodCondition{ updated := apipod.UpdatePodCondition(&newPod.Status, &v1.PodCondition{
Type: v1.DisruptionTarget, Type: v1.DisruptionTarget,
Status: v1.ConditionFalse, ObservedGeneration: apipod.GetPodObservedGenerationIfEnabledOnCondition(newPod, v1.DisruptionTarget),
Status: v1.ConditionFalse,
}) })
if !updated { if !updated {
return nil return nil

9
pkg/controller/podgc/gc_controller.go
View File

@@ -246,10 +246,11 @@ func (gcc *PodGCController) gcOrphaned(ctx context.Context, pods []*v1.Pod, node
} }
logger.V(2).Info("Found orphaned Pod assigned to the Node, deleting", "pod", klog.KObj(pod), "node", klog.KRef("", pod.Spec.NodeName)) logger.V(2).Info("Found orphaned Pod assigned to the Node, deleting", "pod", klog.KObj(pod), "node", klog.KRef("", pod.Spec.NodeName))
condition := &v1.PodCondition{ condition := &v1.PodCondition{
Type: v1.DisruptionTarget, Type: v1.DisruptionTarget,
Status: v1.ConditionTrue, ObservedGeneration: apipod.GetPodObservedGenerationIfEnabledOnCondition(pod, v1.DisruptionTarget),
Reason: "DeletionByPodGC", Status: v1.ConditionTrue,
Message: "PodGC: node no longer exists", Reason: "DeletionByPodGC",
Message: "PodGC: node no longer exists",
} }
if err := gcc.markFailedAndDeletePodWithCondition(ctx, pod, condition); err != nil { if err := gcc.markFailedAndDeletePodWithCondition(ctx, pod, condition); err != nil {
utilruntime.HandleError(err) utilruntime.HandleError(err)

9
pkg/controller/tainteviction/taint_eviction.go
View File

@@ -133,10 +133,11 @@ func addConditionAndDeletePod(ctx context.Context, c clientset.Interface, name,
} }
newStatus := pod.Status.DeepCopy() newStatus := pod.Status.DeepCopy()
updated := apipod.UpdatePodCondition(newStatus, &v1.PodCondition{ updated := apipod.UpdatePodCondition(newStatus, &v1.PodCondition{
Type: v1.DisruptionTarget, Type: v1.DisruptionTarget,
Status: v1.ConditionTrue, ObservedGeneration: apipod.GetPodObservedGenerationIfEnabledOnCondition(pod, v1.DisruptionTarget),
Reason: "DeletionByTaintManager", Status: v1.ConditionTrue,
Message: "Taint manager: deleting due to NoExecute taint", Reason: "DeletionByTaintManager",
Message: "Taint manager: deleting due to NoExecute taint",
}) })
if updated { if updated {
if _, _, _, err := utilpod.PatchPodStatus(ctx, c, pod.Namespace, pod.Name, pod.UID, pod.Status, *newStatus); err != nil { if _, _, _, err := utilpod.PatchPodStatus(ctx, c, pod.Namespace, pod.Name, pod.UID, pod.Status, *newStatus); err != nil {