feat: Add initial CronJob as external reconciler for resource cleanup#22
Open
lbeckman314 wants to merge 2 commits into
Open
feat: Add initial CronJob as external reconciler for resource cleanup#22lbeckman314 wants to merge 2 commits into
lbeckman314 wants to merge 2 commits into
Conversation
Signed-off-by: Liam Beckman <lbeckman314@gmail.com>
lbeckman314
commented
Jun 26, 2026
| {{- include "funnel.labels" . | nindent 4 }} | ||
| spec: | ||
| # Offset the minute so deployments in different namespaces don't all fire simultaneously. | ||
| schedule: {{ printf "%d %s" (.Values.cleanup.scheduleOffsetMinutes | int) (trimPrefix (printf "%d " (.Values.cleanup.scheduleOffsetMinutes | int)) .Values.cleanup.schedule) | default .Values.cleanup.schedule | quote }} |
Contributor
Author
There was a problem hiding this comment.
Need to update this to use the ReconcileRate from Funnel Config instead of cleanup.scheduleOffsetMinutes
The cleanup CronJob now derives its schedule from Kubernetes.ReconcileRate so it shares a single source of truth with the server's reconcile cadence, instead of requiring a separately-maintained cron expression. - Add funnel.durationSeconds and funnel.cleanupSchedule template helpers. The schedule rounds ReconcileRate up to whole minutes (CronJob minute granularity, floor of 1) and honors scheduleOffsetMinutes; an explicit cleanup.schedule still overrides it. - Add the missing cleanup: block (enabled, schedule, scheduleOffsetMinutes) to values.yaml; the cronjob template referenced these values but they were undefined, so the chart could not render. - Replace the inline printf/trimPrefix schedule expression with the helper. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Assisted-by: Claude Code:claude [Claude Code]
8 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Overview 🌀
This PR adds an initial cronjob to act as an for resource cleanup in K8s (i.e. "external reconciler")
It runs an example command (
funnel kubernetes cleanup) that is designed to call the update "modular reconciler" implemented in uc-cdis:funnel:chore/reconcile_modularTip
calypr/funnel@develop...uc-cdis:funnel:chore/reconcile_modular
Current Behavior⚠️
K8s resource cleanup is run in the resource-intensive (and complicated!) functions directly in Funnel:
(kubernetes.Backend).reconcile(kubernetes.Backend).CleanOrphanedResourcesNew Behavior ✔️
Resources are cleaned in a single, user-configurable Helm template.
Caution
TODO: Add examples of defaults + configuration options, for example:
Backwards Compatibilty 🔄
Caution
TODO: Does this new behavior affect existing workflows/setups?