Skip to content

Conversation

@simu
Copy link
Member

@simu simu commented Dec 31, 2025

Checklist

  • The PR has a meaningful title. It will be used to auto-generate the
    changelog.
    The PR has a meaningful description that sums up the change. It will be
    linked in the changelog.
  • PR contains a single logical change (to build a better changelog).
  • Categorize the PR by adding one of the labels:
    bug, enhancement, documentation, change, breaking, dependency
    as they show up in the changelog.

simu added 2 commits December 31, 2025 10:49
We don't necessarily want to drop all contents of `spec.check` or
`spec.prune` when we merge an additional `CheckSpec` or `PruneSpec` over
an existing `Schedule`.

This commit adjusts the two functions to merge their rendered config
into key `spec.check` and `spec.prune` instead of fully overwriting
those keys.
…helper

We need to add the custom CA volume for `check`, `prune` and `backup` in
order for schedules that need a custom CA to work correctly.

This commit requires the change from the previous commit, so that
merging a custom `PruneSpec` over a `Schedule` which configures a custom
CA volume doesn't drop that config.
@simu simu added bug Something isn't working bump:patch labels Dec 31, 2025
@github-actions
Copy link

github-actions bot commented Dec 31, 2025

🚀 This PR has been released as v5.7.2

Triggering workflows Release

🛠️ Auto tagging enabled with label bump:patch

@simu simu requested a review from a team December 31, 2025 09:56
Copy link
Member

@bastjan bastjan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to be alright. One more golden test would help here to verify.

@simu
Copy link
Member Author

simu commented Jan 6, 2026

Seems to be alright. One more golden test would help here to verify.

I remember now why I didn't add a golden test yet. Testing the component lib directly from backup-k8up isn't trivially possible without extra Jsonnet, since we currently don't have a generic way to define Schedule resources via the component parameters. I'll see if I can put something together.

Rendered from template version: main (7e46fac)
@simu
Copy link
Member Author

simu commented Jan 6, 2026

Added new golden test which exercises the Schedule method of the component library. Currently, the golden test only has test cases for a minimal configuration for Schedule and two test cases for the custom CA configmap optional parameter.

@simu simu force-pushed the fix/lib-ca-volume branch from d9d0af1 to b604720 Compare January 6, 2026 13:06
@simu simu merged commit 1e695ef into master Jan 6, 2026
9 checks passed
@simu simu deleted the fix/lib-ca-volume branch January 6, 2026 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working bump:patch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants