Skip to content

[release-1.26] Skip succeeded #974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 2 commits into from
Jul 4, 2025
Merged

[release-1.26] Skip succeeded #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b137991
skip succeeded pods
libesz May 22, 2025
ec4728d
ut added to verify succeeded pods are skipped
libesz May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions controllers/istiorevision/istiorevision_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,9 @@
return false, fmt.Errorf("failed to list pods: %w", err)
}
for _, pod := range podList.Items {
if pod.Status.Phase == corev1.PodSucceeded {
continue

Check warning on line 481 in controllers/istiorevision/istiorevision_controller.go

View check run for this annotation

Codecov / codecov/patch

controllers/istiorevision/istiorevision_controller.go#L481 

Added line #L481 was not covered by tests
}
if ns, found := nsMap[pod.Namespace]; found && podReferencesRevision(pod, ns, rev) {
log.V(2).Info("Revision is referenced by Pod", "Pod", client.ObjectKeyFromObject(&pod))
return true, nil
Expand Down
14 changes: 14 additions & 0 deletions controllers/istiorevision/istiorevision_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,7 @@ func TestDetermineInUseCondition(t *testing.T) {
podLabels map[string]string
podAnnotations map[string]string
nsLabels map[string]string
podPhase corev1.PodPhase
enableAllNamespaces bool
interceptors interceptor.Funcs
matchesRevision string
Expand All @@ -555,6 +556,13 @@ func TestDetermineInUseCondition(t *testing.T) {
matchesRevision: "default",
},

// pod succeeded
{
podAnnotations: map[string]string{"istio.io/rev": "default"},
podPhase: corev1.PodSucceeded,
matchesRevision: "",
},

// namespace labels only
{
nsLabels: map[string]string{"istio-injection": "enabled"},
Expand Down Expand Up @@ -687,6 +695,9 @@ func TestDetermineInUseCondition(t *testing.T) {
nameBuilder.WriteString(k + ":" + v + ",")
}
}
if len(tc.podPhase) > 0 {
nameBuilder.WriteString("Phase:" + string(tc.podPhase) + ",")
}
name := strings.TrimSuffix(nameBuilder.String(), ",")

t.Run(name, func(t *testing.T) {
Expand Down Expand Up @@ -723,6 +734,9 @@ func TestDetermineInUseCondition(t *testing.T) {
Labels: tc.podLabels,
Annotations: tc.podAnnotations,
},
Status: corev1.PodStatus{
Phase: tc.podPhase,
},
}

cl := fake.NewClientBuilder().
Expand Down
3 changes: 3 additions & 0 deletions controllers/istiorevisiontag/istiorevisiontag_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,9 @@
return false, fmt.Errorf("failed to list pods: %w", err)
}
for _, pod := range podList.Items {
if pod.Status.Phase == corev1.PodSucceeded {
continue

Check warning on line 379 in controllers/istiorevisiontag/istiorevisiontag_controller.go

View check run for this annotation

Codecov / codecov/patch

controllers/istiorevisiontag/istiorevisiontag_controller.go#L379 

Added line #L379 was not covered by tests
}
if ns, found := nsMap[pod.Namespace]; found && podReferencesRevisionTag(pod, tag, ns) {
log.V(2).Info("RevisionTag is referenced by Pod", "Pod", client.ObjectKeyFromObject(&pod))
return true, nil
Expand Down