Skip to content

Handle Jobs with TTL in health checks #1578

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
stefanprodan merged 1 commit into from
Feb 3, 2026
Merged

Handle Jobs with TTL in health checks #1578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ require (
github.com/fluxcd/pkg/http/fetch v0.22.0
github.com/fluxcd/pkg/kustomize v1.25.0
github.com/fluxcd/pkg/runtime v0.97.0
github.com/fluxcd/pkg/ssa v0.65.0
github.com/fluxcd/pkg/ssa v0.66.0
github.com/fluxcd/pkg/tar v0.17.0
github.com/fluxcd/pkg/testserver v0.13.0
github.com/fluxcd/source-controller/api v1.7.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ github.com/fluxcd/pkg/runtime v0.97.0 h1:NZ9ZL2RE6J4yNDHI7ZNmL/OnCsDWurzVIvws73F
github.com/fluxcd/pkg/runtime v0.97.0/go.mod h1:FyjNMFNAERkCsF/muTWJYU9MZOsq/m4Sc4aQk/EgQ9E=
github.com/fluxcd/pkg/sourceignore v0.16.0 h1:28+IBmNM1rGNQysiAZXyilFMgS0kno/aJM4zSPgqu2A=
github.com/fluxcd/pkg/sourceignore v0.16.0/go.mod h1:Enjrk4gdk8t9VEp0dU3OHvMiS5ZHafZiL4H/FGNluh0=
github.com/fluxcd/pkg/ssa v0.65.0 h1:pvPYmBmfqS0sRNoi4/IUoocBbglYuD/OJLgOuxMJ9+o=
github.com/fluxcd/pkg/ssa v0.65.0/go.mod h1:RjvVjJIoRo1ecsv91yMuiqzO6cpNag80M6MOB/vrJdc=
github.com/fluxcd/pkg/ssa v0.66.0 h1:CYbCTuws8Sn1xAaOFNz92yS2iS5YBqJgd+DrzmRxfaQ=
github.com/fluxcd/pkg/ssa v0.66.0/go.mod h1:RjvVjJIoRo1ecsv91yMuiqzO6cpNag80M6MOB/vrJdc=
github.com/fluxcd/pkg/tar v0.17.0 h1:uNxbFXy8ly8C7fJ8D7w3rjTNJFrb4Hp1aY/30XkfvxY=
github.com/fluxcd/pkg/tar v0.17.0/go.mod h1:b1xyIRYDD0ket4SV5u0UXYv+ZdN/O/HmIO5jZQdHQls=
github.com/fluxcd/pkg/testserver v0.13.0 h1:xEpBcEYtD7bwvZ+i0ZmChxKkDo/wfQEV3xmnzVybSSg=
Expand Down
13 changes: 8 additions & 5 deletions internal/controller/kustomization_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,8 @@ func (r *KustomizationReconciler) reconcile(
originRevision,
isNewRevision,
drifted,
changeSet.ToObjMetadataSet()); err != nil {
changeSet.ToObjMetadataSet(),
ssautil.ExtractJobsWithTTL(objects)); err != nil {

if errors.Is(err, &runtimeCtrl.QueueEventSource{}) {
return err
Expand Down Expand Up @@ -967,7 +968,8 @@ func (r *KustomizationReconciler) checkHealth(ctx context.Context,
originRevision string,
isNewRevision bool,
drifted bool,
objects object.ObjMetadataSet) error {
objects object.ObjMetadataSet,
jobsWithTTL object.ObjMetadataSet) error {
if len(obj.Spec.HealthChecks) == 0 && !obj.Spec.Wait {
conditions.Delete(obj, meta.HealthyCondition)
return nil
Expand Down Expand Up @@ -1012,9 +1014,10 @@ func (r *KustomizationReconciler) checkHealth(ctx context.Context,
// Check the health with a default timeout of 30sec shorter than the reconciliation interval.
healthCtx := runtimeCtrl.GetInterruptContext(ctx)
if err := manager.WaitForSetWithContext(healthCtx, toCheck, ssa.WaitOptions{
Interval: 5 * time.Second,
Timeout: obj.GetTimeout(),
FailFast: r.FailFast,
Interval: 5 * time.Second,
Timeout: obj.GetTimeout(),
FailFast: r.FailFast,
JobsWithTTL: jobsWithTTL,
}); err != nil {
if is, err := runtimeCtrl.IsObjectEnqueued(ctx); is {
return err
Expand Down
⚡